ic-mops 1.0.1 → 1.1.0

package/commands/watch/watch.ts

@@ -0,0 +1,90 @@
+import chokidar from 'chokidar';
+import path from 'node:path';
+import debounce from 'debounce';
+import chalk from 'chalk';
+import {ErrorChecker} from './error-checker.js';
+import {WarningChecker} from './warning-checker.js';
+import {getMotokoCanisters, getMotokoCanistersWithDeclarations} from './parseDfxJson.js';
+import {getRootDir} from '../../mops.js';
+import {Tester} from './tester.js';
+import {Generator} from './generator.js';
+import {Deployer} from './deployer.js';
+
+let ignore = [
+	'**/node_modules/**',
+	'**/.mops/**',
+	'**/.vessel/**',
+	'**/.git/**',
+];
+
+export async function watch(options : {error : boolean, warning : boolean, test : boolean, generate : boolean, deploy : boolean}) {
+	let hasOptions = Object.values(options).includes(true);
+	if (!hasOptions) {
+		options = {
+			error: true,
+			warning: true,
+			test: true,
+			generate: true,
+			deploy: true,
+		};
+	}
+	options.error = true;
+
+	let rootDir = getRootDir();
+	let canisters = getMotokoCanisters();
+	let canistersWithDeclarations = getMotokoCanistersWithDeclarations();
+	let errorChecker = new ErrorChecker({verbose: true, canisters: canisters});
+	let warningChecker = new WarningChecker({errorChecker, verbose: true, canisters: canisters});
+	let tester = new Tester({errorChecker, verbose: true});
+	let generator = new Generator({errorChecker, verbose: true, canisters: canistersWithDeclarations});
+	let deployer = new Deployer({errorChecker, generator, verbose: true, canisters: canisters});
+
+	let watcher = chokidar.watch([
+		path.join(rootDir, '**/*.mo'),
+		path.join(rootDir, 'mops.toml'),
+	], {
+		ignored: ignore,
+		ignoreInitial: true,
+	});
+
+	let run = debounce(async () => {
+		errorChecker.reset();
+		warningChecker.reset();
+		tester.reset();
+		generator.reset();
+		deployer.reset();
+
+		options.error && await errorChecker.run(print);
+		options.warning && warningChecker.run(print);
+		options.test && tester.run(print);
+		options.generate && await generator.run(print);
+		options.deploy && deployer.run(print);
+	}, 200);
+
+	let print = () => {
+		console.clear();
+		process.stdout.write('\x1Bc');
+
+		options.error && console.log(errorChecker.getOutput());
+		options.warning && console.log(warningChecker.getOutput());
+		options.test && console.log(tester.getOutput());
+		options.generate && console.log(generator.getOutput());
+		options.deploy && console.log(deployer.getOutput());
+
+		let statuses = [];
+		options.error && statuses.push(errorChecker.status);
+		options.warning && statuses.push(warningChecker.status);
+		options.test && statuses.push(tester.status);
+		options.generate && statuses.push(generator.status);
+		options.deploy && statuses.push(deployer.status);
+
+		if (statuses.every(status => status !== 'pending' && status !== 'running')) {
+			console.log(chalk.dim('-'.repeat(50)));
+			console.log(chalk.dim('Waiting for file changes...'));
+			console.log(chalk.dim(`Press ${chalk.bold('Ctrl+C')} to exit.`));
+		}
+	};
+
+	watcher.on('all', run);
+	run();
+}

package/declarations/main/main.did

@@ -91,13 +91,13 @@ type Result_6 =
    err: Err;
    ok: vec record {
              PackageName;
-             PackageVersion;
+             PackageVersion__1;
            };
  };
 type Result_5 = 
  variant {
    err: Err;
-   ok: PackageVersion;
+   ok: PackageVersion__1;
  };
 type Result_4 = 
  variant {
@@ -147,6 +147,7 @@ type Request =
  };
 type PublishingId = text;
 type PageCount = nat;
+type PackageVersion__1 = text;
 type PackageVersion = text;
 type PackageSummary__1 = 
  record {
@@ -155,6 +156,7 @@ type PackageSummary__1 =
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
+   highestVersion: PackageVersion;
    owner: principal;
    ownerInfo: User;
    publication: PackagePublication;
@@ -168,6 +170,7 @@ type PackageSummaryWithChanges__1 =
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
+   highestVersion: PackageVersion;
    owner: principal;
    ownerInfo: User;
    publication: PackagePublication;
@@ -181,6 +184,7 @@ type PackageSummaryWithChanges =
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
+   highestVersion: PackageVersion;
    owner: principal;
    ownerInfo: User;
    publication: PackagePublication;
@@ -193,6 +197,7 @@ type PackageSummary =
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
+   highestVersion: PackageVersion;
    owner: principal;
    ownerInfo: User;
    publication: PackagePublication;
@@ -237,6 +242,7 @@ type PackageDetails =
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
    fileStats: PackageFileStatsPublic;
+   highestVersion: PackageVersion;
    owner: principal;
    ownerInfo: User;
    publication: PackagePublication;
@@ -303,13 +309,13 @@ type Main =
    getDefaultPackages: (text) ->
     (vec record {
            PackageName;
-           PackageVersion;
+           PackageVersion__1;
          }) query;
    getDownloadTrendByPackageId: (PackageId) ->
     (vec DownloadsSnapshot__1) query;
    getDownloadTrendByPackageName: (PackageName) ->
     (vec DownloadsSnapshot__1) query;
-   getFileHashes: (PackageName, PackageVersion) -> (Result_8);
+   getFileHashes: (PackageName, PackageVersion__1) -> (Result_8);
    getFileHashesByPackageIds: (vec PackageId) ->
     (vec record {
            PackageId;
@@ -318,19 +324,19 @@ type Main =
                  blob;
                };
          });
-   getFileHashesQuery: (PackageName, PackageVersion) -> (Result_8) query;
-   getFileIds: (PackageName, PackageVersion) -> (Result_7) query;
+   getFileHashesQuery: (PackageName, PackageVersion__1) -> (Result_8) query;
+   getFileIds: (PackageName, PackageVersion__1) -> (Result_7) query;
    getHighestSemverBatch:
     (vec record {
            PackageName;
-           PackageVersion;
+           PackageVersion__1;
            SemverPart;
          }) -> (Result_6) query;
    getHighestVersion: (PackageName) -> (Result_5) query;
    getMostDownloadedPackages: () -> (vec PackageSummary) query;
    getMostDownloadedPackagesIn7Days: () -> (vec PackageSummary) query;
    getNewPackages: () -> (vec PackageSummary) query;
-   getPackageDetails: (PackageName, PackageVersion) -> (Result_4) query;
+   getPackageDetails: (PackageName, PackageVersion__1) -> (Result_4) query;
    getPackagesByCategory: () -> (vec record {
                                        text;
                                        vec PackageSummary;
@@ -344,10 +350,10 @@ type Main =
    getTotalPackages: () -> (nat) query;
    getUser: (principal) -> (opt User__1) query;
    http_request: (Request) -> (Response) query;
-   notifyInstall: (PackageName, PackageVersion) -> () oneway;
+   notifyInstall: (PackageName, PackageVersion__1) -> () oneway;
    notifyInstalls: (vec record {
                           PackageName;
-                          PackageVersion;
+                          PackageVersion__1;
                         }) -> () oneway;
    restore: (nat) -> ();
    search: (Text, opt nat, opt nat) -> (vec PackageSummary, PageCount) query;

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

@@ -63,7 +63,7 @@ export interface Main {
   'getBackupCanisterId' : ActorMethod<[], Principal>,
   'getDefaultPackages' : ActorMethod<
     [string],
-    Array<[PackageName, PackageVersion]>
+    Array<[PackageName, PackageVersion__1]>
   >,
   'getDownloadTrendByPackageId' : ActorMethod<
     [PackageId],
@@ -73,22 +73,25 @@ export interface Main {
     [PackageName],
     Array<DownloadsSnapshot__1>
   >,
-  'getFileHashes' : ActorMethod<[PackageName, PackageVersion], Result_8>,
+  'getFileHashes' : ActorMethod<[PackageName, PackageVersion__1], Result_8>,
   'getFileHashesByPackageIds' : ActorMethod<
     [Array<PackageId>],
     Array<[PackageId, Array<[FileId, Uint8Array | number[]]>]>
   >,
-  'getFileHashesQuery' : ActorMethod<[PackageName, PackageVersion], Result_8>,
-  'getFileIds' : ActorMethod<[PackageName, PackageVersion], Result_7>,
+  'getFileHashesQuery' : ActorMethod<
+    [PackageName, PackageVersion__1],
+    Result_8
+  >,
+  'getFileIds' : ActorMethod<[PackageName, PackageVersion__1], Result_7>,
   'getHighestSemverBatch' : ActorMethod<
-    [Array<[PackageName, PackageVersion, SemverPart]>],
+    [Array<[PackageName, PackageVersion__1, SemverPart]>],
     Result_6
   >,
   'getHighestVersion' : ActorMethod<[PackageName], Result_5>,
   'getMostDownloadedPackages' : ActorMethod<[], Array<PackageSummary>>,
   'getMostDownloadedPackagesIn7Days' : ActorMethod<[], Array<PackageSummary>>,
   'getNewPackages' : ActorMethod<[], Array<PackageSummary>>,
-  'getPackageDetails' : ActorMethod<[PackageName, PackageVersion], Result_4>,
+  'getPackageDetails' : ActorMethod<[PackageName, PackageVersion__1], Result_4>,
   'getPackagesByCategory' : ActorMethod<
     [],
     Array<[string, Array<PackageSummary>]>
@@ -102,9 +105,9 @@ export interface Main {
   'getTotalPackages' : ActorMethod<[], bigint>,
   'getUser' : ActorMethod<[Principal], [] | [User__1]>,
   'http_request' : ActorMethod<[Request], Response>,
-  'notifyInstall' : ActorMethod<[PackageName, PackageVersion], undefined>,
+  'notifyInstall' : ActorMethod<[PackageName, PackageVersion__1], undefined>,
   'notifyInstalls' : ActorMethod<
-    [Array<[PackageName, PackageVersion]>],
+    [Array<[PackageName, PackageVersion__1]>],
     undefined
   >,
   'restore' : ActorMethod<[bigint], undefined>,
@@ -182,6 +185,7 @@ export interface PackageDetails {
   'deps' : Array<PackageSummary__1>,
   'quality' : PackageQuality,
   'testStats' : TestStats__1,
+  'highestVersion' : PackageVersion,
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
   'downloadTrend' : Array<DownloadsSnapshot>,
@@ -221,6 +225,7 @@ export interface PackageSummary {
   'owner' : Principal,
   'depAlias' : string,
   'quality' : PackageQuality,
+  'highestVersion' : PackageVersion,
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
   'downloadsInLast7Days' : bigint,
@@ -232,6 +237,7 @@ export interface PackageSummaryWithChanges {
   'owner' : Principal,
   'depAlias' : string,
   'quality' : PackageQuality,
+  'highestVersion' : PackageVersion,
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
   'downloadsInLast7Days' : bigint,
@@ -244,6 +250,7 @@ export interface PackageSummaryWithChanges__1 {
   'owner' : Principal,
   'depAlias' : string,
   'quality' : PackageQuality,
+  'highestVersion' : PackageVersion,
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
   'downloadsInLast7Days' : bigint,
@@ -256,6 +263,7 @@ export interface PackageSummary__1 {
   'owner' : Principal,
   'depAlias' : string,
   'quality' : PackageQuality,
+  'highestVersion' : PackageVersion,
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
   'downloadsInLast7Days' : bigint,
@@ -263,6 +271,7 @@ export interface PackageSummary__1 {
   'publication' : PackagePublication,
 }
 export type PackageVersion = string;
+export type PackageVersion__1 = string;
 export type PageCount = bigint;
 export type PublishingId = string;
 export interface Request {
@@ -290,9 +299,9 @@ export type Result_3 = { 'ok' : FileId } |
   { 'err' : Err };
 export type Result_4 = { 'ok' : PackageDetails } |
   { 'err' : Err };
-export type Result_5 = { 'ok' : PackageVersion } |
+export type Result_5 = { 'ok' : PackageVersion__1 } |
   { 'err' : Err };
-export type Result_6 = { 'ok' : Array<[PackageName, PackageVersion]> } |
+export type Result_6 = { 'ok' : Array<[PackageName, PackageVersion__1]> } |
   { 'err' : Err };
 export type Result_7 = { 'ok' : Array<FileId> } |
   { 'err' : Err };

package/declarations/main/main.did.js

@@ -4,7 +4,7 @@ export const idlFactory = ({ IDL }) => {
   const Result = IDL.Variant({ 'ok' : IDL.Null, 'err' : Err });
   const Text = IDL.Text;
   const PackageName = IDL.Text;
-  const PackageVersion = IDL.Text;
+  const PackageVersion__1 = IDL.Text;
   const PackageId = IDL.Text;
   const Time = IDL.Int;
   const DownloadsSnapshot__1 = IDL.Record({
@@ -24,10 +24,10 @@ export const idlFactory = ({ IDL }) => {
     'patch' : IDL.Null,
   });
   const Result_6 = IDL.Variant({
-    'ok' : IDL.Vec(IDL.Tuple(PackageName, PackageVersion)),
+    'ok' : IDL.Vec(IDL.Tuple(PackageName, PackageVersion__1)),
     'err' : Err,
   });
-  const Result_5 = IDL.Variant({ 'ok' : PackageVersion, 'err' : Err });
+  const Result_5 = IDL.Variant({ 'ok' : PackageVersion__1, 'err' : Err });
   const User = IDL.Record({
     'id' : IDL.Principal,
     'emailVerified' : IDL.Bool,
@@ -55,6 +55,7 @@ export const idlFactory = ({ IDL }) => {
     'hasRepository' : IDL.Bool,
     'hasReleaseNotes' : IDL.Bool,
   });
+  const PackageVersion = IDL.Text;
   const Script = IDL.Record({ 'value' : IDL.Text, 'name' : IDL.Text });
   const PackageName__1 = IDL.Text;
   const DependencyV2 = IDL.Record({
@@ -92,6 +93,7 @@ export const idlFactory = ({ IDL }) => {
     'owner' : IDL.Principal,
     'depAlias' : IDL.Text,
     'quality' : PackageQuality,
+    'highestVersion' : PackageVersion,
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
     'downloadsInLast7Days' : IDL.Nat,
@@ -119,6 +121,7 @@ export const idlFactory = ({ IDL }) => {
     'owner' : IDL.Principal,
     'depAlias' : IDL.Text,
     'quality' : PackageQuality,
+    'highestVersion' : PackageVersion,
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
     'downloadsInLast7Days' : IDL.Nat,
@@ -160,6 +163,7 @@ export const idlFactory = ({ IDL }) => {
     'owner' : IDL.Principal,
     'depAlias' : IDL.Text,
     'quality' : PackageQuality,
+    'highestVersion' : PackageVersion,
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
     'downloadsInLast7Days' : IDL.Nat,
@@ -175,6 +179,7 @@ export const idlFactory = ({ IDL }) => {
     'deps' : IDL.Vec(PackageSummary__1),
     'quality' : PackageQuality,
     'testStats' : TestStats__1,
+    'highestVersion' : PackageVersion,
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
     'downloadTrend' : IDL.Vec(DownloadsSnapshot),
@@ -193,6 +198,7 @@ export const idlFactory = ({ IDL }) => {
     'owner' : IDL.Principal,
     'depAlias' : IDL.Text,
     'quality' : PackageQuality,
+    'highestVersion' : PackageVersion,
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
     'downloadsInLast7Days' : IDL.Nat,
@@ -295,7 +301,7 @@ export const idlFactory = ({ IDL }) => {
     'getBackupCanisterId' : IDL.Func([], [IDL.Principal], ['query']),
     'getDefaultPackages' : IDL.Func(
         [IDL.Text],
-        [IDL.Vec(IDL.Tuple(PackageName, PackageVersion))],
+        [IDL.Vec(IDL.Tuple(PackageName, PackageVersion__1))],
         ['query'],
       ),
     'getDownloadTrendByPackageId' : IDL.Func(
@@ -308,7 +314,11 @@ export const idlFactory = ({ IDL }) => {
         [IDL.Vec(DownloadsSnapshot__1)],
         ['query'],
       ),
-    'getFileHashes' : IDL.Func([PackageName, PackageVersion], [Result_8], []),
+    'getFileHashes' : IDL.Func(
+        [PackageName, PackageVersion__1],
+        [Result_8],
+        [],
+      ),
     'getFileHashesByPackageIds' : IDL.Func(
         [IDL.Vec(PackageId)],
         [
@@ -319,17 +329,17 @@ export const idlFactory = ({ IDL }) => {
         [],
       ),
     'getFileHashesQuery' : IDL.Func(
-        [PackageName, PackageVersion],
+        [PackageName, PackageVersion__1],
         [Result_8],
         ['query'],
       ),
     'getFileIds' : IDL.Func(
-        [PackageName, PackageVersion],
+        [PackageName, PackageVersion__1],
         [Result_7],
         ['query'],
       ),
     'getHighestSemverBatch' : IDL.Func(
-        [IDL.Vec(IDL.Tuple(PackageName, PackageVersion, SemverPart))],
+        [IDL.Vec(IDL.Tuple(PackageName, PackageVersion__1, SemverPart))],
         [Result_6],
         ['query'],
       ),
@@ -346,7 +356,7 @@ export const idlFactory = ({ IDL }) => {
       ),
     'getNewPackages' : IDL.Func([], [IDL.Vec(PackageSummary)], ['query']),
     'getPackageDetails' : IDL.Func(
-        [PackageName, PackageVersion],
+        [PackageName, PackageVersion__1],
         [Result_4],
         ['query'],
       ),
@@ -369,9 +379,13 @@ export const idlFactory = ({ IDL }) => {
     'getTotalPackages' : IDL.Func([], [IDL.Nat], ['query']),
     'getUser' : IDL.Func([IDL.Principal], [IDL.Opt(User__1)], ['query']),
     'http_request' : IDL.Func([Request], [Response], ['query']),
-    'notifyInstall' : IDL.Func([PackageName, PackageVersion], [], ['oneway']),
+    'notifyInstall' : IDL.Func(
+        [PackageName, PackageVersion__1],
+        [],
+        ['oneway'],
+      ),
     'notifyInstalls' : IDL.Func(
-        [IDL.Vec(IDL.Tuple(PackageName, PackageVersion))],
+        [IDL.Vec(IDL.Tuple(PackageName, PackageVersion__1))],
         [],
         ['oneway'],
       ),

package/dist/check-requirements.js

@@ -9,7 +9,7 @@ export async function checkRequirements({ verbose = false } = {}) {
     let config = readConfig();
     let mocVersion = config.toolchain?.moc;
     if (!mocVersion) {
-        mocVersion = getMocVersion();
+        mocVersion = getMocVersion(false);
     }
     if (!mocVersion) {
         return;

package/dist/cli.js

@@ -1,5 +1,6 @@
 import process from 'node:process';
 import fs from 'node:fs';
+import events from 'node:events';
 import { Command, Argument, Option } from 'commander';
 import { init } from './commands/init.js';
 import { publish } from './commands/publish.js';
@@ -23,6 +24,8 @@ import { transferOwnership } from './commands/transfer-ownership.js';
 import { toolchain } from './commands/toolchain/index.js';
 import * as self from './commands/self.js';
 import { resolvePackages } from './resolve-packages.js';
+import { watch } from './commands/watch/watch.js';
+events.setMaxListeners(20);
 let networkFile = getNetworkFile();
 if (fs.existsSync(networkFile)) {
     globalThis.MOPS_NETWORK = fs.readFileSync(networkFile).toString() || 'ic';
@@ -72,6 +75,7 @@ program
     .command('install')
     .alias('i')
     .description('Install all dependencies specified in mops.toml')
+    .option('--no-toolchain', 'Do not install toolchain')
     .option('--verbose')
     .addOption(new Option('--lock <action>', 'Lockfile action').choices(['check', 'update', 'ignore']))
     .action(async (options) => {
@@ -82,9 +86,13 @@ program
     if (!compatible) {
         return;
     }
-    await toolchain.ensureToolchainInited({ strict: false });
+    if (options.toolchain) {
+        await toolchain.ensureToolchainInited({ strict: false });
+    }
     let ok = await installAll(options);
-    await toolchain.installAll(options);
+    if (options.toolchain) {
+        await toolchain.installAll(options);
+    }
     // check conflicts
     await resolvePackages({ conflicts: 'warning' });
     if (!ok) {
@@ -136,7 +144,7 @@ program
         process.exit(1);
     }
     if (options.install) {
-        await installAll({ silent: true, lock: 'ignore', threads: 6 });
+        await installAll({ silent: true, lock: 'ignore', threads: 6, installFromLockFile: true });
     }
     await toolchain.ensureToolchainInited({ strict: false });
     let sourcesArr = await sources(options);
@@ -177,7 +185,7 @@ program
     .option('-w, --watch', 'Enable watch mode')
     .action(async (filter, options) => {
     checkConfigFile(true);
-    await installAll({ silent: true, lock: 'ignore' });
+    await installAll({ silent: true, lock: 'ignore', installFromLockFile: true });
     await test(filter, options);
 });
 // bench
@@ -192,7 +200,7 @@ program
     .addOption(new Option('--verbose', 'Show more information'))
     .action(async (filter, options) => {
     checkConfigFile(true);
-    await installAll({ silent: true, lock: 'ignore' });
+    await installAll({ silent: true, lock: 'ignore', installFromLockFile: true });
     await bench(filter, options);
 });
 // template
@@ -338,4 +346,17 @@ selfCommand
     await self.uninstall();
 });
 program.addCommand(selfCommand);
+// watch
+program
+    .command('watch')
+    .description('Watch *.mo files and check for syntax errors, warnings, run tests, generate declarations and deploy canisters')
+    .option('-e, --error', 'Check Motoko canisters or *.mo files for syntax errors')
+    .option('-w, --warning', 'Check Motoko canisters or *.mo files for warnings')
+    .option('-t, --test', 'Run tests')
+    .option('-g, --generate', 'Generate declarations for Motoko canisters')
+    .option('-d, --deploy', 'Deploy Motoko canisters')
+    .action(async (options) => {
+    checkConfigFile(true);
+    await watch(options);
+});
 program.parse();

package/dist/commands/bench.js

@@ -33,7 +33,7 @@ export async function bench(filter = '', optionsArg = {}) {
         replica: config.toolchain?.['pocket-ic'] ? 'pocket-ic' : 'dfx',
         replicaVersion: '',
         compiler: 'moc',
-        compilerVersion: getMocVersion(),
+        compilerVersion: getMocVersion(true),
         gc: 'copying',
         forceGc: true,
         save: false,

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

@@ -3,6 +3,7 @@ type InstallAllOptions = {
     silent?: boolean;
     lock?: 'check' | 'update' | 'ignore';
     threads?: number;
+    installFromLockFile?: boolean;
 };
-export declare function installAll({ verbose, silent, threads, lock }?: InstallAllOptions): Promise<boolean>;
+export declare function installAll({ verbose, silent, threads, lock, installFromLockFile }?: InstallAllOptions): Promise<boolean>;
 export {};

package/dist/commands/install/install-all.js

@@ -1,13 +1,13 @@
 import process from 'node:process';
 import chalk from 'chalk';
 import { createLogUpdate } from 'log-update';
-import { checkConfigFile, readConfig } from '../../mops.js';
-import { checkIntegrity } from '../../integrity.js';
+import { checkConfigFile, parseDepValue, readConfig } from '../../mops.js';
+import { checkIntegrity, checkLockFileLight, readLockFile } from '../../integrity.js';
 import { installDeps } from './install-deps.js';
 import { checkRequirements } from '../../check-requirements.js';
 import { syncLocalCache } from './sync-local-cache.js';
 import { notifyInstalls } from '../../notify-installs.js';
-export async function installAll({ verbose = false, silent = false, threads, lock } = {}) {
+export async function installAll({ verbose = false, silent = false, threads, lock, installFromLockFile } = {}) {
     if (!checkConfigFile()) {
         return false;
     }
@@ -15,9 +15,27 @@ export async function installAll({ verbose = false, silent = false, threads, loc
     let deps = Object.values(config.dependencies || {});
     let devDeps = Object.values(config['dev-dependencies'] || {});
     let allDeps = [...deps, ...devDeps];
-    let ok = await installDeps(allDeps, { silent, verbose, threads });
-    if (!ok) {
-        return false;
+    let installedFromLockFile = false;
+    // install from lock file to avoid installing intermediate dependencies
+    if ((lock !== 'ignore' || installFromLockFile) && checkLockFileLight()) {
+        let lockFileJson = readLockFile();
+        if (lockFileJson && lockFileJson.version === 3) {
+            verbose && console.log('Installing from lock file...');
+            installedFromLockFile = true;
+            let lockedDeps = Object.entries(lockFileJson.deps).map(([name, version]) => {
+                return parseDepValue(name, version);
+            });
+            let ok = await installDeps(lockedDeps, { silent, verbose, threads, ignoreTransitive: true });
+            if (!ok) {
+                return false;
+            }
+        }
+    }
+    if (!installedFromLockFile) {
+        let ok = await installDeps(allDeps, { silent, verbose, threads });
+        if (!ok) {
+            return false;
+        }
     }
     let logUpdate = createLogUpdate(process.stdout, { showCursor: true });
     if (!silent && lock !== 'ignore') {

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

@@ -3,6 +3,7 @@ type InstallDepOptions = {
     verbose?: boolean;
     silent?: boolean;
     threads?: number;
+    ignoreTransitive?: boolean;
 };
-export declare function installDep(dep: Dependency, { verbose, silent, threads }?: InstallDepOptions, parentPkgPath?: string): Promise<boolean>;
+export declare function installDep(dep: Dependency, { verbose, silent, threads, ignoreTransitive }?: InstallDepOptions, parentPkgPath?: string): Promise<boolean>;
 export {};

package/dist/commands/install/install-dep.js

@@ -5,9 +5,9 @@ import { installLocalDep } from './install-local-dep.js';
 import { getRootDir } from '../../mops.js';
 // install dependency
 // returns false if failed
-export async function installDep(dep, { verbose, silent, threads } = {}, parentPkgPath) {
+export async function installDep(dep, { verbose, silent, threads, ignoreTransitive } = {}, parentPkgPath) {
     if (dep.repo) {
-        await installFromGithub(dep.name, dep.repo, { silent, verbose });
+        await installFromGithub(dep.name, dep.repo, { silent, verbose, ignoreTransitive });
         return true;
     }
     else if (dep.path) {
@@ -16,10 +16,10 @@ export async function installDep(dep, { verbose, silent, threads } = {}, parentP
         if (parentPkgPath) {
             depPath = path.resolve(parentPkgPath, dep.path);
         }
-        return installLocalDep(dep.name, depPath, { silent, verbose });
+        return installLocalDep(dep.name, depPath, { silent, verbose, ignoreTransitive });
     }
     else if (dep.version) {
-        return installMopsDep(dep.name, dep.version, { silent, verbose, threads });
+        return installMopsDep(dep.name, dep.version, { silent, verbose, threads, ignoreTransitive });
     }
     return true;
 }

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

@@ -3,6 +3,7 @@ type InstallDepsOptions = {
     verbose?: boolean;
     silent?: boolean;
     threads?: number;
+    ignoreTransitive?: boolean;
 };
-export declare function installDeps(deps: Dependency[], { verbose, silent, threads }?: InstallDepsOptions, parentPkgPath?: string): Promise<boolean>;
+export declare function installDeps(deps: Dependency[], { verbose, silent, threads, ignoreTransitive }?: InstallDepsOptions, parentPkgPath?: string): Promise<boolean>;
 export {};

package/dist/commands/install/install-deps.js

@@ -2,10 +2,10 @@ import { installDep } from './install-dep.js';
 // install all dependencies
 // returns actual installed dependencies
 // returns false if failed
-export async function installDeps(deps, { verbose, silent, threads } = {}, parentPkgPath) {
+export async function installDeps(deps, { verbose, silent, threads, ignoreTransitive } = {}, parentPkgPath) {
     let ok = true;
     for (const dep of deps) {
-        let res = await installDep(dep, { verbose, silent, threads }, parentPkgPath);
+        let res = await installDep(dep, { verbose, silent, threads, ignoreTransitive }, parentPkgPath);
         if (!res) {
             ok = false;
         }