chore: rename putil

package-lock.json

@@ -43,7 +43,7 @@
       "dependencies": {
         "@heyputer/kv.js": "^0.1.3",
         "@heyputer/multest": "^0.0.2",
-        "@heyputer/puter-js-common": "^1.0.0",
+        "@heyputer/putil": "^1.0.0",
         "@opentelemetry/api": "^1.4.1",
         "@opentelemetry/auto-instrumentations-node": "^0.43.0",
         "@opentelemetry/exporter-trace-otlp-grpc": "^0.40.0",
@@ -195,7 +195,7 @@
         "webpack-cli": "^5.1.4"
       }
     },
-    "asdf/puter-js-common": {
+    "asdf/putil": {
       "version": "1.0.0",
       "extraneous": true,
       "license": "UNLICENSED"
@@ -2597,14 +2597,18 @@
       "resolved": "src/phoenix",
       "link": true
     },
-    "node_modules/@heyputer/puter-js-common": {
+    "node_modules/@heyputer/puter-wisp": {
-      "resolved": "src/puter-js-common",
+      "resolved": "src/puter-wisp",
       "link": true
     },
     "node_modules/@heyputer/puterjs": {
       "resolved": "src/puter-js",
       "link": true
     },
+    "node_modules/@heyputer/putil": {
+      "resolved": "src/putil",
+      "link": true
+    },
     "node_modules/@heyputer/terminal": {
       "resolved": "src/terminal",
       "link": true
@@ -12515,9 +12519,9 @@
       "license": "MIT"
     },
     "node_modules/mocha": {
-      "version": "10.6.0",
+      "version": "10.7.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz",
-      "integrity": "sha512-hxjt4+EEB0SA0ZDygSS015t65lJw/I2yRCS3Ae+SJ5FrbzrXgfYwJr96f0OvIXdj7h4lv/vLCrH3rkiuizFSvw==",
+      "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16442,7 +16446,7 @@
       "dependencies": {
         "@heyputer/kv.js": "^0.1.3",
         "@heyputer/multest": "^0.0.2",
-        "@heyputer/puter-js-common": "^1.0.0",
+        "@heyputer/putil": "^1.0.0",
         "@opentelemetry/api": "^1.4.1",
         "@opentelemetry/auto-instrumentations-node": "^0.43.0",
         "@opentelemetry/exporter-trace-otlp-grpc": "^0.40.0",
@@ -16617,8 +16621,8 @@
         "webpack-cli": "^5.1.4"
       }
     },
-    "packages/puter-js-common": {
+    "packages/putil": {
-      "name": "@heyputer/puter-js-common",
+      "name": "@heyputer/putil",
       "version": "1.0.0",
       "extraneous": true,
       "license": "UNLICENSED"
@@ -16662,7 +16666,7 @@
         "@aws-sdk/client-textract": "^3.621.0",
         "@heyputer/kv.js": "^0.1.3",
         "@heyputer/multest": "^0.0.2",
-        "@heyputer/puter-js-common": "^1.0.0",
+        "@heyputer/putil": "^1.0.0",
         "@mistralai/mistralai": "^1.0.3",
         "@opentelemetry/api": "^1.4.1",
         "@opentelemetry/auto-instrumentations-node": "^0.43.0",
@@ -16902,8 +16906,13 @@
         "webpack-cli": "^5.1.4"
       }
     },
-    "src/puter-js-common": {
+    "src/puter-wisp": {
-      "name": "@heyputer/puter-js-common",
+      "name": "@heyputer/puter-wisp",
+      "version": "1.0.0",
+      "license": "AGPL-3.0-only"
+    },
+    "src/putil": {
+      "name": "@heyputer/putil",
       "version": "1.0.0",
       "license": "UNLICENSED"
     },

src/backend/doc/contributors/index.md

@@ -71,7 +71,7 @@ doing the useless work that reveals what the useful work is.
 
 ## Underlying Constructs
 
-- [puter-js-common's README.md](../../packages/puter-js-common/README.md)
+- [putil's README.md](../../packages/putil/README.md)
   - Whenever you see `AdvancedBase`, that's from here
     - Many things in backend extend this. Anything that doesn't only doesn't
       because it was written before `AdvancedBase` existed.

src/backend/doc/contributors/modules.md

@@ -35,7 +35,7 @@ To function properly, Puter needs **CoreModule**, a database module,
 and a storage module.
 
 A module extends
-[AdvancedBase](../../../puter-js-common/README.md)
+[AdvancedBase](../../../putil/README.md)
 and implements
 an `install` method. The install method has one parameter, a
 [Context](../../src/util/context.js)

src/backend/package.json

@@ -12,7 +12,7 @@
     "@aws-sdk/client-textract": "^3.621.0",
     "@heyputer/kv.js": "^0.1.3",
     "@heyputer/multest": "^0.0.2",
-    "@heyputer/puter-js-common": "^1.0.0",
+    "@heyputer/putil": "^1.0.0",
     "@mistralai/mistralai": "^1.0.3",
     "@opentelemetry/api": "^1.4.1",
     "@opentelemetry/auto-instrumentations-node": "^0.43.0",

src/backend/src/CoreModule.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const Library = require("./definitions/Library");
 const { NotificationES } = require("./om/entitystorage/NotificationES");
 const { ProtectedAppES } = require("./om/entitystorage/ProtectedAppES");

src/backend/src/DatabaseModule.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 class DatabaseModule extends AdvancedBase {
     async install (context) {

src/backend/src/Kernel.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { Context } = require('./util/context');
 const BaseService = require("./services/BaseService");
 const useapi = require('useapi');

src/backend/src/LocalDiskStorageModule.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 class LocalDiskStorageModule extends AdvancedBase {
     async install (context) {

src/backend/src/PuterDriversModule.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 class PuterDriversModule extends AdvancedBase {
     async install () {}

src/backend/src/ThirdPartyDriversModule.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 class ThirdPartyDriversModule extends AdvancedBase {
     // constructor () {

src/backend/src/boot/RuntimeEnvironment.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { quot } = require("../util/strutil");
 const { TechnicalError } = require("../errors/TechnicalError");
 const { print_error_help } = require("../errors/error_help_details");

src/backend/src/config/ConfigLoader.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { quot } = require("../util/strutil");
 
 class ConfigLoader extends AdvancedBase {

src/backend/src/definitions/Driver.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { Context } = require('../util/context')
 const APIError = require("../api/APIError");
 const { AppUnderUserActorType, UserActorType } = require("../services/auth/Actor");

src/backend/src/filesystem/FilesystemService.js

@@ -27,7 +27,7 @@ const SystemFSEntryService = require('./storage/SystemFSEntryService.js');
 const PerformanceMonitor = require('../monitor/PerformanceMonitor.js');
 const { NodePathSelector, NodeUIDSelector, NodeInternalIDSelector } = require('./node/selectors.js');
 const FSNodeContext = require('./FSNodeContext.js');
-const { AdvancedBase } = require('@heyputer/puter-js-common');
+const { AdvancedBase } = require('@heyputer/putil');
 const { Context } = require('../util/context.js');
 const { simple_retry } = require('../util/retryutil.js');
 const APIError = require('../api/APIError.js');

src/backend/src/filesystem/batch/BatchExecutor.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require('@heyputer/puter-js-common');
+const { AdvancedBase } = require('@heyputer/putil');
 const PathResolver = require('../../routers/filesystem_api/batch/PathResolver');
 const commands = require('./commands').commands;
 const { WorkUnit } = require('../../services/runtime-analysis/ExpectationService');

src/backend/src/filesystem/batch/commands.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { AsyncProviderFeature } = require("../../traits/AsyncProviderFeature");
 const { HLMkdir, QuickMkdir } = require("../hl_operations/hl_mkdir");
 const { Context } = require("../../util/context");

src/backend/src/filesystem/storage/DatabaseFSEntryService.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { id2path } = require("../../helpers");
 
 const { PuterPath } = require("../lib/PuterPath");

src/backend/src/modules/broadcast/BroadcastModule.js

@@ -1,4 +1,4 @@
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 class BroadcastModule extends AdvancedBase {
     async install (context) {

src/backend/src/modules/broadcast/BroadcastService.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const BaseService = require("../../services/BaseService");
 const { CLink } = require("./connection/CLink");
 const { SLink } = require("./connection/SLink");

src/backend/src/modules/broadcast/connection/BaseLink.js

@@ -1,4 +1,4 @@
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { ChannelFeature } = require("../../../traits/ChannelFeature");
 
 class BaseLink extends AdvancedBase {

src/backend/src/modules/broadcast/connection/KeyPairHelper.js

@@ -1,4 +1,4 @@
-const { AdvancedBase } = require('@heyputer/puter-js-common');
+const { AdvancedBase } = require('@heyputer/putil');
 
 class KeyPairHelper extends AdvancedBase {
     static MODULES = {

src/backend/src/modules/puterai/PuterAIModule.js

@@ -1,4 +1,4 @@
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const config = require("../../config");
 
 class PuterAIModule extends AdvancedBase {

src/backend/src/modules/selfhosted/SelfHostedModule.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const config = require("../../config");
 
 class SelfHostedModule extends AdvancedBase {

src/backend/src/modules/test-drivers/TestDriversModule.js

@@ -1,4 +1,4 @@
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 class TestDriversModule extends AdvancedBase {
     async install (context) {

src/backend/src/om/IdentifierUtil.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { WeakConstructorFeature } = require("../traits/WeakConstructorFeature");
 const { Eq, And } = require("./query/query");
 const { Entity } = require("./entitystorage/Entity");

src/backend/src/om/definitions/Mapping.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { instance_ } = require("../../monitor/PerformanceMonitor");
 const { WeakConstructorFeature } = require("../../traits/WeakConstructorFeature");
 const { Property } = require("./Property");

src/backend/src/om/definitions/PropType.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { WeakConstructorFeature } = require("../../traits/WeakConstructorFeature");
 
 class PropType extends AdvancedBase {

src/backend/src/om/definitions/Property.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { WeakConstructorFeature } = require("../../traits/WeakConstructorFeature");
 
 class Property extends AdvancedBase {

src/backend/src/om/entitystorage/BaseES.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { WeakConstructorFeature } = require("../../traits/WeakConstructorFeature");
 const { Context } = require("../../util/context");
 

src/backend/src/om/entitystorage/Entity.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { WeakConstructorFeature } = require("../../traits/WeakConstructorFeature");
 
 class Entity extends AdvancedBase {

src/backend/src/om/entitystorage/SQLES.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { BaseES } = require("./BaseES");
 
 const APIError = require("../../api/APIError");

src/backend/src/om/entitystorage/ValidationES.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { BaseES } = require("./BaseES");
 
 const APIError = require("../../api/APIError");

src/backend/src/om/query/query.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { WeakConstructorFeature } = require("../../traits/WeakConstructorFeature");
 
 class Predicate extends AdvancedBase {

src/backend/src/routers/hosting/puter-site.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const api_error_handler = require("../../api/api_error_handler");
 const config = require("../../config");
 const { get_user, get_app, id2path } = require("../../helpers");

src/backend/src/services/BaseService.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 const NOOP = async () => {};
 

src/backend/src/services/Container.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const config = require("../config");
 const { Context } = require("../util/context");
 const { CompositeError } = require("../util/errorutil");

src/backend/src/services/EngPortalService.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 class EngPortalService extends AdvancedBase {
     static MODULES = {

src/backend/src/services/OperationTraceService.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { Context } = require("../util/context");
 const { ContextAwareFeature } = require("../traits/ContextAwareFeature");
 const { OtelFeature } = require("../traits/OtelFeature");

src/backend/src/services/RegistryService.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const BaseService = require("./BaseService");
 
 class MapCollection extends AdvancedBase {

src/backend/src/services/ServicePatch.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 class ServicePatch extends AdvancedBase {
     patch ({ original_service }) {

src/backend/src/services/StorageService.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 class StorageService extends AdvancedBase {
     constructor ({ services }) {

src/backend/src/services/WSPushService.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 class WSPushService  extends AdvancedBase {
     static MODULES = {

src/backend/src/services/abuse-prevention/IdentificationService.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const BaseService = require("../BaseService");
 const { Context } = require("../../util/context");
 const config = require("../../config");

src/backend/src/services/auth/Actor.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { Context } = require("../../util/context");
 const { get_user, get_app } = require("../../helpers");
 const config = require("../../config");

src/backend/src/services/database/BaseDatabaseAccessService.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const BaseService = require("../BaseService");
 const { DB_WRITE, DB_READ } = require("./consts");
 

src/backend/src/services/drivers/DriverService.js

@@ -23,7 +23,7 @@ const { TypedValue } = require("./meta/Runtime");
 const BaseService = require("../BaseService");
 const { Driver } = require("../../definitions/Driver");
 const { PermissionUtil } = require("../auth/PermissionService");
-const { Invoker } = require("@heyputer/puter-js-common/src/libs/invoker");
+const { Invoker } = require("../../../../putil/src/libs/invoker");
 const { get_user } = require("../../helpers");
 
 /**

src/backend/src/services/drivers/FileFacade.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { Context } = require("../../util/context");
 const { MultiValue } = require("../../util/multivalue");
 const { stream_to_buffer } = require("../../util/streamutil");

src/backend/src/services/drivers/meta/Construct.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { BasicBase } = require("@heyputer/puter-js-common/src/bases/BasicBase");
+const { BasicBase } = require("../../../../../putil/src/bases/BasicBase");
 const types = require("../types");
 const { hash_serializable_object, stringify_serializable_object } = require("../../../util/datautil");
 

src/backend/src/services/drivers/meta/Runtime.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { BasicBase } = require("@heyputer/puter-js-common/src/bases/BasicBase");
+const { BasicBase } = require("../../../../../putil/src/bases/BasicBase");
 const { TypeSpec } = require("./Construct");
 
 class RuntimeEntity extends BasicBase {

src/backend/src/services/drivers/types.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { is_valid_path } = require("../../filesystem/validation");
 const { is_valid_url, is_valid_uuid4 } = require("../../helpers");
 const { FileFacade } = require("./FileFacade");

src/backend/src/services/file-cache/FileCacheService.js

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 const TeePromise = require("@heyputer/multest/src/util/TeePromise");
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const { FileTracker } = require("./FileTracker");
 const { pausing_tee } = require("../../util/streamutil");
 

src/backend/src/services/sla/RateLimitService.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const APIError = require("../../api/APIError");
 const { Context } = require("../../util/context");
 const BaseService = require("../BaseService");

src/backend/src/services/thumbnails/HTTPThumbnailService.js

@@ -22,7 +22,7 @@
 const axios = require('axios');
 
 const { TeePromise } = require("../../util/promise");
-const { AdvancedBase } = require('@heyputer/puter-js-common');
+const { AdvancedBase } = require('@heyputer/putil');
 const FormData = require("form-data");
 const { stream_to_the_void, buffer_to_stream } = require('../../util/streamutil');
 const BaseService = require('../BaseService');

src/backend/src/util/multivalue.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 /**
  * MutliValue represents a subject with multiple values or a value with multiple

src/backend/src/util/pathutil.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 
 /**
  * PathBuilder implements the builder pattern for building paths.

src/backend/tools/test.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/puter-js-common");
+const { AdvancedBase } = require("@heyputer/putil");
 const useapi = require("useapi");
 const { BaseService } = require("../exports");
 const CoreModule = require("../src/CoreModule");

src/git/src/filesystem.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import { PosixError } from '@heyputer/puter-js-common/src/PosixError.js';
+import { PosixError } from '@heyputer/putil/src/PosixError.js';
 import path_ from 'path-browserify';
 
 let debug = false;

src/phoenix/src/platform/node/filesystem.js

@@ -20,7 +20,7 @@ import fs from 'fs';
 import path_ from 'path';
 
 import modeString from 'fs-mode-to-string';
-import { ErrorCodes, PosixError } from '@heyputer/puter-js-common/src/PosixError.js';
+import { ErrorCodes, PosixError } from '@heyputer/putil/src/PosixError.js';
 
 // DRY: Almost the same as puter/filesystem.js
 function wrapAPIs(apis) {

src/phoenix/src/platform/puter/filesystem.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import { ErrorCodes, PosixError } from '@heyputer/puter-js-common/src/PosixError.js';
+import { ErrorCodes, PosixError } from '@heyputer/putil/src/PosixError.js';
 
 // DRY: Almost the same as node/filesystem.js
 function wrapAPIs(apis) {

src/phoenix/src/puter-shell/coreutils/errno.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import { ErrorCodes, ErrorMetadata, errorFromIntegerCode } from '@heyputer/puter-js-common/src/PosixError.js';
+import { ErrorCodes, ErrorMetadata, errorFromIntegerCode } from '@heyputer/putil/src/PosixError.js';
 import { Exit } from './coreutil_lib/exit.js';
 
 const maxErrorNameLength = Object.keys(ErrorCodes)

src/phoenix/src/puter-shell/coreutils/touch.js

@@ -18,7 +18,7 @@
  */
 import { Exit } from './coreutil_lib/exit.js';
 import { resolveRelativePath } from '../../util/path.js';
-import { ErrorCodes } from '@heyputer/puter-js-common/src/PosixError.js';
+import { ErrorCodes } from '@heyputer/putil/src/PosixError.js';
 
 export default {
     name: 'touch',

src/phoenix/test/coreutils/errno.js

@@ -19,7 +19,7 @@
 import assert from 'assert';
 import { MakeTestContext } from './harness.js'
 import builtins from '../../src/puter-shell/coreutils/__exports__.js';
-import { ErrorCodes, ErrorMetadata } from '@heyputer/puter-js-common/src/PosixError.js';
+import { ErrorCodes, ErrorMetadata } from '@heyputer/putil/src/PosixError.js';
 
 export const runErrnoTests = () => {
     describe('errno', function () {

src/pty/exports.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import { libs } from '@heyputer/puter-js-common';
+import { libs } from '@heyputer/putil';
 const { TeePromise, raceCase } = libs.promise;
 
 const encoder = new TextEncoder();

src/putil/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@heyputer/puter-js-common",
+  "name": "@heyputer/putil",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",