ic-mops 0.38.2 → 0.39.1

package/commands/install-all.ts

@@ -6,6 +6,7 @@ import {install} from './install.js';
 import {installFromGithub} from '../vessel.js';
 import {notifyInstalls} from '../notify-installs.js';
 import {checkIntegrity} from '../integrity.js';
+import {installLocal} from './install-local.js';
 
 type InstallAllOptions = {
 	verbose?: boolean;
@@ -28,8 +29,8 @@ export async function installAll({verbose = false, silent = false, lock}: Instal
 		if (repo) {
 			await installFromGithub(name, repo, {verbose, silent});
 		}
-		else if (!path) {
-			let res = await install(name, version, {verbose, silent});
+		else {
+			let res = await (path ? installLocal(name, path, {silent, verbose}) : install(name, version, {silent, verbose}));
 			if (res === false) {
 				return;
 			}
@@ -38,7 +39,6 @@ export async function installAll({verbose = false, silent = false, lock}: Instal
 	}
 
 	let logUpdate = createLogUpdate(process.stdout, {showCursor: true});
-	// let logUpdate = l;
 
 	if (!silent && lock !== 'ignore') {
 		logUpdate('Checking integrity...');

package/commands/install-local.ts

@@ -0,0 +1,51 @@
+import path from 'node:path';
+import {createLogUpdate} from 'log-update';
+import {checkConfigFile, getRootDir, readConfig} from '../mops.js';
+import {installFromGithub} from '../vessel.js';
+import {install} from './install.js';
+
+// skip install and just find non-local dependencies to install
+// pkgPath should be relative to the current root dir or absolute
+export async function installLocal(pkg: string, pkgPath = '', {verbose = false, silent = false} = {}): Promise<Record<string, string> | false> {
+	if (!checkConfigFile()) {
+		return false;
+	}
+
+	let logUpdate = createLogUpdate(process.stdout, {showCursor: true});
+
+	logUpdate(`Local dependency ${pkg} = "${pkgPath}"`);
+
+	if (verbose) {
+		silent || logUpdate.done();
+	}
+	else {
+		logUpdate.clear();
+	}
+
+	// install dependencies
+	let ok = true;
+	let rootDir = getRootDir();
+	let dir = path.resolve(rootDir, pkgPath);
+	let config = readConfig(path.join(dir, 'mops.toml'));
+	let deps = Object.values(config.dependencies || {});
+	let installedDeps = {};
+	for (const {name, repo, version, path: depPath} of deps) {
+		if (repo) {
+			await installFromGithub(name, repo, {silent, verbose});
+		}
+		else {
+			let res = await (depPath ? installLocal(name, path.resolve(pkgPath, depPath), {silent, verbose}) : install(name, version, {silent, verbose}));
+			if (res) {
+				installedDeps = {...installedDeps, ...res};
+			}
+			else {
+				ok = false;
+			}
+		}
+	}
+
+	if (!ok) {
+		return false;
+	}
+	return installedDeps;
+}

package/commands/install.ts

@@ -9,6 +9,7 @@ import {parallel} from '../parallel.js';
 import {installFromGithub} from '../vessel.js';
 import {addCache, copyCache, isCached} from '../cache.js';
 import {downloadFile, getPackageFilesInfo} from '../api/downloadPackageFiles.js';
+import {installLocal} from './install-local.js';
 
 export async function install(pkg: string, version = '', {verbose = false, silent = false, dep = false} = {}): Promise<Record<string, string> | false> {
 	if (!checkConfigFile()) {
@@ -99,12 +100,12 @@ export async function install(pkg: string, version = '', {verbose = false, silen
 	let config = readConfig(path.join(dir, 'mops.toml'));
 	let deps = Object.values(config.dependencies || {});
 	let installedDeps = {};
-	for (const {name, repo, version} of deps) {
+	for (const {name, repo, version, path: depPath} of deps) {
 		if (repo) {
 			await installFromGithub(name, repo, {silent, verbose});
 		}
 		else {
-			let res = await install(name, version, {silent, verbose});
+			let res = await (depPath ? installLocal(name, depPath, {silent, verbose}) : install(name, version, {silent, verbose}));
 			if (res) {
 				installedDeps = {...installedDeps, ...res};
 			}

package/commands/sources.ts

@@ -40,7 +40,7 @@ export async function sources({verbose = false, cwd = process.cwd()} = {}) {
 		}
 
 		// use pkgDir if baseDir doesn't exist for local packages
-		if (depType === 'local' && !fs.existsSync(pkgBaseDir)) {
+		if (depType === 'local' && !fs.existsSync(path.resolve(cwd, pkgBaseDir))) {
 			pkgBaseDir = pkgDir;
 		}
 

package/declarations/main/main.did

@@ -24,11 +24,6 @@ type User =
    twitter: text;
    twitterVerified: bool;
  };
-type TransformArg = 
- record {
-   context: vec nat8;
-   response: HttpResponse;
- };
 type Time = int;
 type Text = text;
 type TestsChanges = 
@@ -344,14 +339,19 @@ type Main =
    startFileUpload: (PublishingId, Text, nat, blob) -> (Result_3);
    startPublish: (PackageConfigV2) -> (Result_2);
    transferOwnership: (PackageName, principal) -> (Result_1);
-   transformRequest: (TransformArg) -> (HttpResponse) query;
+   transformRequest: (HttpTransformArg) -> (HttpResponse) query;
    uploadFileChunk: (PublishingId, FileId, nat, blob) -> (Result);
    uploadNotes: (PublishingId, text) -> (Result);
    uploadTestStats: (PublishingId, TestStats) -> (Result);
  };
+type HttpTransformArg = 
+ record {
+   context: blob;
+   response: HttpResponse;
+ };
 type HttpResponse = 
  record {
-   body: vec nat8;
+   body: blob;
    headers: vec HttpHeader;
    status: nat;
  };

package/declarations/main/main.did.d.ts

@@ -33,6 +33,10 @@ export interface HttpResponse {
   'body' : Uint8Array | number[],
   'headers' : Array<HttpHeader>,
 }
+export interface HttpTransformArg {
+  'context' : Uint8Array | number[],
+  'response' : HttpResponse,
+}
 export interface Main {
   'backup' : ActorMethod<[], undefined>,
   'computeHashesForExistingFiles' : ActorMethod<[], undefined>,
@@ -96,7 +100,7 @@ export interface Main {
   >,
   'startPublish' : ActorMethod<[PackageConfigV2], Result_2>,
   'transferOwnership' : ActorMethod<[PackageName, Principal], Result_1>,
-  'transformRequest' : ActorMethod<[TransformArg], HttpResponse>,
+  'transformRequest' : ActorMethod<[HttpTransformArg], HttpResponse>,
   'uploadFileChunk' : ActorMethod<
     [PublishingId, FileId, bigint, Uint8Array | number[]],
     Result
@@ -296,10 +300,6 @@ export interface TestsChanges {
 }
 export type Text = string;
 export type Time = bigint;
-export interface TransformArg {
-  'context' : Uint8Array | number[],
-  'response' : HttpResponse,
-}
 export interface User {
   'id' : Principal,
   'emailVerified' : boolean,

package/declarations/main/main.did.js

@@ -251,7 +251,7 @@ export const idlFactory = ({ IDL }) => {
     'body' : IDL.Vec(IDL.Nat8),
     'headers' : IDL.Vec(HttpHeader),
   });
-  const TransformArg = IDL.Record({
+  const HttpTransformArg = IDL.Record({
     'context' : IDL.Vec(IDL.Nat8),
     'response' : HttpResponse,
   });
@@ -360,7 +360,11 @@ export const idlFactory = ({ IDL }) => {
         [Result_1],
         [],
       ),
-    'transformRequest' : IDL.Func([TransformArg], [HttpResponse], ['query']),
+    'transformRequest' : IDL.Func(
+        [HttpTransformArg],
+        [HttpResponse],
+        ['query'],
+      ),
     'uploadFileChunk' : IDL.Func(
         [PublishingId, FileId, IDL.Nat, IDL.Vec(IDL.Nat8)],
         [Result],

package/dist/commands/install-all.js

@@ -6,6 +6,7 @@ import { install } from './install.js';
 import { installFromGithub } from '../vessel.js';
 import { notifyInstalls } from '../notify-installs.js';
 import { checkIntegrity } from '../integrity.js';
+import { installLocal } from './install-local.js';
 export async function installAll({ verbose = false, silent = false, lock } = {}) {
     if (!checkConfigFile()) {
         return;
@@ -19,8 +20,8 @@ export async function installAll({ verbose = false, silent = false, lock } = {})
         if (repo) {
             await installFromGithub(name, repo, { verbose, silent });
         }
-        else if (!path) {
-            let res = await install(name, version, { verbose, silent });
+        else {
+            let res = await (path ? installLocal(name, path, { silent, verbose }) : install(name, version, { silent, verbose }));
             if (res === false) {
                 return;
             }
@@ -28,7 +29,6 @@ export async function installAll({ verbose = false, silent = false, lock } = {})
         }
     }
     let logUpdate = createLogUpdate(process.stdout, { showCursor: true });
-    // let logUpdate = l;
     if (!silent && lock !== 'ignore') {
         logUpdate('Checking integrity...');
     }

package/dist/commands/install-local.d.ts

@@ -0,0 +1,4 @@
+export declare function installLocal(pkg: string, pkgPath?: string, { verbose, silent }?: {
+    verbose?: boolean | undefined;
+    silent?: boolean | undefined;
+}): Promise<Record<string, string> | false>;

package/dist/commands/install-local.js

@@ -0,0 +1,45 @@
+import path from 'node:path';
+import { createLogUpdate } from 'log-update';
+import { checkConfigFile, getRootDir, readConfig } from '../mops.js';
+import { installFromGithub } from '../vessel.js';
+import { install } from './install.js';
+// skip install and just find non-local dependencies to install
+// pkgPath should be relative to the current root dir or absolute
+export async function installLocal(pkg, pkgPath = '', { verbose = false, silent = false } = {}) {
+    if (!checkConfigFile()) {
+        return false;
+    }
+    let logUpdate = createLogUpdate(process.stdout, { showCursor: true });
+    logUpdate(`Local dependency ${pkg} = "${pkgPath}"`);
+    if (verbose) {
+        silent || logUpdate.done();
+    }
+    else {
+        logUpdate.clear();
+    }
+    // install dependencies
+    let ok = true;
+    let rootDir = getRootDir();
+    let dir = path.resolve(rootDir, pkgPath);
+    let config = readConfig(path.join(dir, 'mops.toml'));
+    let deps = Object.values(config.dependencies || {});
+    let installedDeps = {};
+    for (const { name, repo, version, path: depPath } of deps) {
+        if (repo) {
+            await installFromGithub(name, repo, { silent, verbose });
+        }
+        else {
+            let res = await (depPath ? installLocal(name, path.resolve(pkgPath, depPath), { silent, verbose }) : install(name, version, { silent, verbose }));
+            if (res) {
+                installedDeps = { ...installedDeps, ...res };
+            }
+            else {
+                ok = false;
+            }
+        }
+    }
+    if (!ok) {
+        return false;
+    }
+    return installedDeps;
+}

package/dist/commands/install.js

@@ -9,6 +9,7 @@ import { parallel } from '../parallel.js';
 import { installFromGithub } from '../vessel.js';
 import { addCache, copyCache, isCached } from '../cache.js';
 import { downloadFile, getPackageFilesInfo } from '../api/downloadPackageFiles.js';
+import { installLocal } from './install-local.js';
 export async function install(pkg, version = '', { verbose = false, silent = false, dep = false } = {}) {
     if (!checkConfigFile()) {
         return false;
@@ -84,12 +85,12 @@ export async function install(pkg, version = '', { verbose = false, silent = fal
     let config = readConfig(path.join(dir, 'mops.toml'));
     let deps = Object.values(config.dependencies || {});
     let installedDeps = {};
-    for (const { name, repo, version } of deps) {
+    for (const { name, repo, version, path: depPath } of deps) {
         if (repo) {
             await installFromGithub(name, repo, { silent, verbose });
         }
         else {
-            let res = await install(name, version, { silent, verbose });
+            let res = await (depPath ? installLocal(name, depPath, { silent, verbose }) : install(name, version, { silent, verbose }));
             if (res) {
                 installedDeps = { ...installedDeps, ...res };
             }

package/dist/commands/sources.js

@@ -34,7 +34,7 @@ export async function sources({ verbose = false, cwd = process.cwd() } = {}) {
             pkgBaseDir = path.join(pkgDir, 'src');
         }
         // use pkgDir if baseDir doesn't exist for local packages
-        if (depType === 'local' && !fs.existsSync(pkgBaseDir)) {
+        if (depType === 'local' && !fs.existsSync(path.resolve(cwd, pkgBaseDir))) {
             pkgBaseDir = pkgDir;
         }
         return `--package ${name} ${pkgBaseDir}`;

package/dist/declarations/main/main.did

@@ -24,11 +24,6 @@ type User =
    twitter: text;
    twitterVerified: bool;
  };
-type TransformArg = 
- record {
-   context: vec nat8;
-   response: HttpResponse;
- };
 type Time = int;
 type Text = text;
 type TestsChanges = 
@@ -344,14 +339,19 @@ type Main =
    startFileUpload: (PublishingId, Text, nat, blob) -> (Result_3);
    startPublish: (PackageConfigV2) -> (Result_2);
    transferOwnership: (PackageName, principal) -> (Result_1);
-   transformRequest: (TransformArg) -> (HttpResponse) query;
+   transformRequest: (HttpTransformArg) -> (HttpResponse) query;
    uploadFileChunk: (PublishingId, FileId, nat, blob) -> (Result);
    uploadNotes: (PublishingId, text) -> (Result);
    uploadTestStats: (PublishingId, TestStats) -> (Result);
  };
+type HttpTransformArg = 
+ record {
+   context: blob;
+   response: HttpResponse;
+ };
 type HttpResponse = 
  record {
-   body: vec nat8;
+   body: blob;
    headers: vec HttpHeader;
    status: nat;
  };

package/dist/declarations/main/main.did.d.ts

@@ -33,6 +33,10 @@ export interface HttpResponse {
   'body' : Uint8Array | number[],
   'headers' : Array<HttpHeader>,
 }
+export interface HttpTransformArg {
+  'context' : Uint8Array | number[],
+  'response' : HttpResponse,
+}
 export interface Main {
   'backup' : ActorMethod<[], undefined>,
   'computeHashesForExistingFiles' : ActorMethod<[], undefined>,
@@ -96,7 +100,7 @@ export interface Main {
   >,
   'startPublish' : ActorMethod<[PackageConfigV2], Result_2>,
   'transferOwnership' : ActorMethod<[PackageName, Principal], Result_1>,
-  'transformRequest' : ActorMethod<[TransformArg], HttpResponse>,
+  'transformRequest' : ActorMethod<[HttpTransformArg], HttpResponse>,
   'uploadFileChunk' : ActorMethod<
     [PublishingId, FileId, bigint, Uint8Array | number[]],
     Result
@@ -296,10 +300,6 @@ export interface TestsChanges {
 }
 export type Text = string;
 export type Time = bigint;
-export interface TransformArg {
-  'context' : Uint8Array | number[],
-  'response' : HttpResponse,
-}
 export interface User {
   'id' : Principal,
   'emailVerified' : boolean,

package/dist/declarations/main/main.did.js

@@ -251,7 +251,7 @@ export const idlFactory = ({ IDL }) => {
     'body' : IDL.Vec(IDL.Nat8),
     'headers' : IDL.Vec(HttpHeader),
   });
-  const TransformArg = IDL.Record({
+  const HttpTransformArg = IDL.Record({
     'context' : IDL.Vec(IDL.Nat8),
     'response' : HttpResponse,
   });
@@ -360,7 +360,11 @@ export const idlFactory = ({ IDL }) => {
         [Result_1],
         [],
       ),
-    'transformRequest' : IDL.Func([TransformArg], [HttpResponse], ['query']),
+    'transformRequest' : IDL.Func(
+        [HttpTransformArg],
+        [HttpResponse],
+        ['query'],
+      ),
     'uploadFileChunk' : IDL.Func(
         [PublishingId, FileId, IDL.Nat, IDL.Vec(IDL.Nat8)],
         [Result],

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.38.2",
+  "version": "0.39.1",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",

package/dist/resolve-packages.js

@@ -6,6 +6,7 @@ export async function resolvePackages({ verbose = false } = {}) {
     if (!checkConfigFile()) {
         return {};
     }
+    let rootDir = getRootDir();
     let packages = {};
     let versions = {};
     let compareVersions = (a = '0.0.0', b = '0.0.0') => {
@@ -36,7 +37,7 @@ export async function resolvePackages({ verbose = false } = {}) {
             return 1;
         }
     };
-    let collectDeps = async (config, isRoot = false) => {
+    let collectDeps = async (config, configDir, isRoot = false) => {
         let allDeps = [...Object.values(config.dependencies || {})];
         if (isRoot) {
             allDeps = [...allDeps, ...Object.values(config['dev-dependencies'] || {})];
@@ -49,22 +50,34 @@ export async function resolvePackages({ verbose = false } = {}) {
                 || !packages[name]?.isRoot
                     && (repo && packages[name]?.repo && compareGitVersions(packages[name]?.repo || '', repo) === -1
                         || compareVersions(packages[name]?.version, version) === -1)) {
-                packages[name] = {
+                let temp = {
                     ...pkgDetails,
                     isRoot,
                 };
+                packages[name] = temp;
+                // normalize path relative to the root config dir
+                if (pkgDetails.path) {
+                    temp.path = path.relative(rootDir, path.resolve(configDir, pkgDetails.path));
+                }
             }
             let nestedConfig;
+            let nestedDir = '';
+            // read nested config
             if (repo) {
-                const dir = formatGithubDir(name, repo);
-                nestedConfig = await readVesselConfig(dir, { silent: true }) || {};
+                nestedDir = formatGithubDir(name, repo);
+                nestedConfig = await readVesselConfig(nestedDir, { silent: true }) || {};
+            }
+            else if (pkgDetails.path) {
+                nestedDir = path.resolve(configDir, pkgDetails.path);
+                nestedConfig = readConfig(nestedDir + '/mops.toml');
             }
-            else if (!pkgDetails.path && version) {
-                const file = formatDir(name, version) + '/mops.toml';
-                nestedConfig = readConfig(file);
+            else if (version) {
+                nestedDir = formatDir(name, version);
+                nestedConfig = readConfig(nestedDir + '/mops.toml');
             }
-            if (nestedConfig && !pkgDetails.path) {
-                await collectDeps(nestedConfig);
+            // collect nested deps
+            if (nestedConfig) {
+                await collectDeps(nestedConfig, nestedDir);
             }
             if (!versions[name]) {
                 versions[name] = [];
@@ -79,7 +92,7 @@ export async function resolvePackages({ verbose = false } = {}) {
         }
     };
     let config = readConfig();
-    await collectDeps(config, true);
+    await collectDeps(config, rootDir, true);
     // show conflicts
     if (verbose) {
         for (let [dep, vers] of Object.entries(versions)) {
@@ -88,7 +101,6 @@ export async function resolvePackages({ verbose = false } = {}) {
             }
         }
     }
-    let rootDir = getRootDir();
     return Object.fromEntries(Object.entries(packages).map(([name, pkg]) => {
         let version;
         if (pkg.path) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.38.2",
+  "version": "0.39.1",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",

package/resolve-packages.ts

@@ -9,6 +9,7 @@ export async function resolvePackages({verbose = false} = {}): Promise<Record<st
 		return {};
 	}
 
+	let rootDir = getRootDir();
 	let packages: Record<string, Dependency & {isRoot: boolean;}> = {};
 	let versions: Record<string, string[]> = {};
 
@@ -44,7 +45,7 @@ export async function resolvePackages({verbose = false} = {}): Promise<Record<st
 		}
 	};
 
-	let collectDeps = async (config: Config | VesselConfig, isRoot = false) => {
+	let collectDeps = async (config: Config | VesselConfig, configDir: string, isRoot = false) => {
 		let allDeps = [...Object.values(config.dependencies || {})];
 		if (isRoot) {
 			allDeps = [...allDeps, ...Object.values(config['dev-dependencies'] || {})];
@@ -61,25 +62,38 @@ export async function resolvePackages({verbose = false} = {}): Promise<Record<st
 					repo && packages[name]?.repo && compareGitVersions(packages[name]?.repo || '', repo) === -1
 					|| compareVersions(packages[name]?.version, version) === -1)
 			) {
-				packages[name] = {
+				let temp = {
 					...pkgDetails,
 					isRoot,
 				};
+				packages[name] = temp;
+
+				// normalize path relative to the root config dir
+				if (pkgDetails.path) {
+					temp.path = path.relative(rootDir, path.resolve(configDir, pkgDetails.path));
+				}
 			}
 
 			let nestedConfig;
+			let nestedDir = '';
 
+			// read nested config
 			if (repo) {
-				const dir = formatGithubDir(name, repo);
-				nestedConfig = await readVesselConfig(dir, {silent: true}) || {};
+				nestedDir = formatGithubDir(name, repo);
+				nestedConfig = await readVesselConfig(nestedDir, {silent: true}) || {};
+			}
+			else if (pkgDetails.path) {
+				nestedDir = path.resolve(configDir, pkgDetails.path);
+				nestedConfig = readConfig(nestedDir + '/mops.toml');
 			}
-			else if (!pkgDetails.path && version) {
-				const file = formatDir(name, version) + '/mops.toml';
-				nestedConfig = readConfig(file);
+			else if (version) {
+				nestedDir = formatDir(name, version);
+				nestedConfig = readConfig(nestedDir + '/mops.toml');
 			}
 
-			if (nestedConfig && !pkgDetails.path) {
-				await collectDeps(nestedConfig);
+			// collect nested deps
+			if (nestedConfig) {
+				await collectDeps(nestedConfig, nestedDir);
 			}
 
 			if (!versions[name]) {
@@ -97,7 +111,7 @@ export async function resolvePackages({verbose = false} = {}): Promise<Record<st
 	};
 
 	let config = readConfig();
-	await collectDeps(config, true);
+	await collectDeps(config, rootDir, true);
 
 	// show conflicts
 	if (verbose) {
@@ -108,8 +122,6 @@ export async function resolvePackages({verbose = false} = {}): Promise<Record<st
 		}
 	}
 
-	let rootDir = getRootDir();
-
 	return Object.fromEntries(
 		Object.entries(packages).map(([name, pkg]) => {
 			let version: string;