@jujulego/jill 2.5.1 → 3.0.0-alpha.1

package/dist/utils/json.d.ts

@@ -1,2 +1 @@
-/// <reference types="node" resolution-mode="require"/>
 export declare function printJson(data: unknown, stream?: NodeJS.WriteStream): void;

package/dist/utils/worker-cache.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import { type Serializable } from 'node:worker_threads';
 import { type Awaitable } from '@/src/types.ts';
 export declare function workerCache<R extends Serializable>(key: Serializable, compute: () => Awaitable<R>): Promise<R>;

package/dist/{workspace-tree-BJ9EO1FB.js → workspace-tree-VWKE0B6b.js}

@@ -1,6 +1,6 @@
 import { _ } from '@swc/helpers/_/_ts_decorate';
 import { Logger, withLabel } from '@jujulego/logger';
-import { S as Service, u as TASK_MANAGER, n as lazyInject, C as CONFIG, m as container, q as CommandTask, t as ScriptTask, M as Middleware, D as ContextService, l as CURRENT, o as lazyInjectNamed, E as ExitException, i as getRegistry, k as setModule } from './ink-command-dQCqkmg0.js';
+import { S as Service, u as TASK_MANAGER, n as lazyInject, C as CONFIG, m as container, q as CommandTask, t as ScriptTask, M as Middleware, D as ContextService, l as CURRENT, o as lazyInjectNamed, E as ExitException, i as getRegistry, k as setModule } from './ink-command-CsbkuRbm.js';
 import { _ as _$1 } from '@swc/helpers/_/_ts_param';
 import { inject, injectable, ContainerModule, id } from 'inversify';
 import symbols from 'log-symbols';
@@ -28,22 +28,22 @@ async function* combine(...generators) {
 async function* streamLines(task, stream) {
     // Abort
     const off = off$();
-    once$(task, "completed", off);
+    once$(task, 'completed', off);
     // Stream
-    let current = "";
+    let current = '';
     try {
         for await (const chunk of iterate$(task, `stream.${stream}`, {
             off
         })){
-            const data = current + chunk.data.toString("utf-8");
+            const data = current + chunk.data.toString('utf-8');
             const lines = data.split(/\r?\n/);
-            current = lines.pop() ?? "";
+            current = lines.pop() ?? '';
             for (const line of lines){
                 yield line;
             }
         }
     } catch (err) {
-        if (err.message !== "Unsubscribed !") {
+        if (err.message !== 'Unsubscribed !') {
             throw err;
         }
         if (current) {
@@ -71,14 +71,14 @@ class GitService {
             ...options
         };
         // Create task
-        const task = new SpawnTask("git", [
+        const task = new SpawnTask('git', [
             cmd,
             ...args
         ], {
             command: cmd,
             hidden: true
         }, opts);
-        task.on("stream", ({ data })=>opts.logger.debug(data.toString("utf-8")));
+        task.on('stream', ({ data })=>opts.logger.debug(data.toString('utf-8')));
         this.manager.add(task);
         return task;
     }
@@ -88,7 +88,7 @@ class GitService {
    * @param args
    * @param options
    */ branch(args, options) {
-        return this.command("branch", args, options);
+        return this.command('branch', args, options);
     }
     /**
    * Runs git diff
@@ -96,7 +96,7 @@ class GitService {
    * @param args
    * @param options
    */ diff(args, options) {
-        return this.command("diff", args, options);
+        return this.command('diff', args, options);
     }
     /**
    * Runs git tag
@@ -104,7 +104,7 @@ class GitService {
    * @param args
    * @param options
    */ tag(args, options) {
-        return this.command("tag", args, options);
+        return this.command('tag', args, options);
     }
     /**
    * Uses git diff to detect if given files have been affected since given reference
@@ -115,13 +115,13 @@ class GitService {
    */ isAffected(reference, files = [], opts) {
         return new Promise((resolve, reject)=>{
             const task = this.diff([
-                "--quiet",
+                '--quiet',
                 reference,
-                "--",
+                '--',
                 ...files
             ], opts);
-            once$(task, "status.done", ()=>resolve(false));
-            once$(task, "status.failed", ()=>{
+            once$(task, 'status.done', ()=>resolve(false));
+            once$(task, 'status.failed', ()=>{
                 if (task.exitCode) {
                     resolve(true);
                 } else {
@@ -137,12 +137,12 @@ class GitService {
    * @param opts
    */ async listBranches(args = [], opts) {
         const task = this.branch([
-            "-l",
+            '-l',
             ...args
         ], opts);
         const result = [];
-        for await (const line of streamLines(task, "stdout")){
-            result.push(line.replace(/^[ *] /, ""));
+        for await (const line of streamLines(task, 'stdout')){
+            result.push(line.replace(/^[ *] /, ''));
         }
         return result;
     }
@@ -153,11 +153,11 @@ class GitService {
    * @param opts
    */ async listTags(args = [], opts) {
         const task = this.tag([
-            "-l",
+            '-l',
             ...args
         ], opts);
         const result = [];
-        for await (const line of streamLines(task, "stdout")){
+        for await (const line of streamLines(task, 'stdout')){
             result.push(line);
         }
         return result;
@@ -183,14 +183,14 @@ class AffectedFilter {
         // Format revision
         let result = this.format;
         result = result.replace(/(?<!\\)((?:\\\\)*)%name/g, `$1${wks.name}`);
-        result = result.replace(/\\(.)/g, "$1");
+        result = result.replace(/\\(.)/g, '$1');
         // Ask git to complete it
         const sortArgs = this.sort ? [
-            "--sort",
+            '--sort',
             this.sort
         ] : [];
         // - search in branches
-        if (result.includes("*")) {
+        if (result.includes('*')) {
             const branches = await this._git.listBranches([
                 ...sortArgs,
                 result
@@ -203,7 +203,7 @@ class AffectedFilter {
             }
         }
         // - search in tags
-        if (result.includes("*")) {
+        if (result.includes('*')) {
             const tags = await this._git.listTags([
                 ...sortArgs,
                 result
@@ -218,7 +218,7 @@ class AffectedFilter {
         if (result !== this.format) {
             logger.verbose`Resolved ${this.format} into ${result}`;
         }
-        if (result.includes("*")) {
+        if (result.includes('*')) {
             logger.warning(`No revision found matching ${result}, using fallback ${this.fallback}`);
             return this.fallback;
         }
@@ -307,10 +307,10 @@ class Workspace {
     }
     // Methods
     _satisfies(from, range) {
-        if (range.startsWith("file:")) {
+        if (range.startsWith('file:')) {
             return path.resolve(from.cwd, range.substring(5)) === this.cwd;
         }
-        if (range.startsWith("workspace:")) {
+        if (range.startsWith('workspace:')) {
             range = range.substring(10);
         }
         return !this.version || satisfies(this.version, range);
@@ -318,11 +318,11 @@ class Workspace {
     async _buildDependencies(task, opts) {
         // Generators
         const generators = [];
-        switch(opts.buildDeps ?? "all"){
-            case "all":
+        switch(opts.buildDeps ?? 'all'){
+            case 'all':
                 generators.unshift(this.devDependencies());
             // eslint-disable-next no-fallthrough
-            case "prod":
+            case 'prod':
                 generators.unshift(this.dependencies());
         }
         // Build deps
@@ -373,13 +373,13 @@ class Workspace {
     }
     async *dependencies() {
         if (!this.manifest.dependencies) return;
-        for await (const ws of this._loadDependencies(this.manifest.dependencies, "dependency")){
+        for await (const ws of this._loadDependencies(this.manifest.dependencies, 'dependency')){
             yield ws;
         }
     }
     async *devDependencies() {
         if (!this.manifest.devDependencies) return;
-        for await (const ws of this._loadDependencies(this.manifest.devDependencies, "devDependency")){
+        for await (const ws of this._loadDependencies(this.manifest.devDependencies, 'devDependency')){
             yield ws;
         }
     }
@@ -388,9 +388,9 @@ class Workspace {
         const task = new CommandTask(this, command, args, {
             ...opts,
             logger: this._logger.child(withLabel(`${this.name}$${command}`)),
-            superCommand: pm === "yarn" ? [
-                "yarn",
-                "exec"
+            superCommand: pm === 'yarn' ? [
+                'yarn',
+                'exec'
             ] : undefined
         });
         await this._buildDependencies(task, opts);
@@ -416,9 +416,9 @@ class Workspace {
         return task;
     }
     async build(opts = {}) {
-        const task = await this.run(opts?.buildScript ?? "build", [], opts);
+        const task = await this.run(opts?.buildScript ?? 'build', [], opts);
         if (!task) {
-            this._logger.warning("Will not be built (no build script)");
+            this._logger.warning('Will not be built (no build script)');
         }
         return task;
     }
@@ -476,11 +476,11 @@ class Project {
     }
     // Methods
     async _loadManifest(dir) {
-        const file = path.resolve(this.root, dir, "package.json");
+        const file = path.resolve(this.root, dir, 'package.json');
         const relative = path.relative(this.root, path.dirname(file));
-        const logger = this._logger.child(withLabel(relative ? `project@${relative}` : "project"));
-        logger.debug("Loading package.json ...");
-        const data = await fs.promises.readFile(file, "utf-8");
+        const logger = this._logger.child(withLabel(relative ? `project@${relative}` : 'project'));
+        logger.debug('Loading package.json ...');
+        const data = await fs.promises.readFile(file, 'utf-8');
         const mnf = JSON.parse(data);
         normalize(mnf, (msg)=>logger.verbose(msg));
         return mnf;
@@ -503,23 +503,23 @@ class Project {
             const files = await this._scurry.readdir(this.root, {
                 withFileTypes: false
             });
-            if (files.includes("yarn.lock")) {
+            if (files.includes('yarn.lock')) {
                 this._logger.debug`Detected yarn in #!cwd:${this.root}`;
-                this._packageManager = "yarn";
-            } else if (files.includes("package-lock.json")) {
+                this._packageManager = 'yarn';
+            } else if (files.includes('package-lock.json')) {
                 this._logger.debug`Detected npm in #!cwd:${this.root}`;
-                this._packageManager = "npm";
+                this._packageManager = 'npm';
             } else {
                 this._logger.debug`No package manager recognized in #!cwd:${this.root}, defaults to npm`;
-                this._packageManager = "npm";
+                this._packageManager = 'npm';
             }
         }
         return this._packageManager;
     }
     async mainWorkspace() {
         if (!this._mainWorkspace) {
-            const manifest = await this._loadManifest(".");
-            this._mainWorkspace = new Workspace(".", manifest, this);
+            const manifest = await this._loadManifest('.');
+            this._mainWorkspace = new Workspace('.', manifest, this);
             this._names.set(this._mainWorkspace.name, this._mainWorkspace);
         }
         return this._mainWorkspace;
@@ -556,7 +556,7 @@ class Project {
                         yield await this._loadWorkspace(dir.fullpath());
                     }
                 } catch (error) {
-                    if (error.code === "ENOENT") {
+                    if (error.code === 'ENOENT') {
                         continue;
                     }
                     throw error;
@@ -597,17 +597,17 @@ Project = _([
 ], Project);
 
 // Constants
-const MANIFEST = "package.json";
+const MANIFEST = 'package.json';
 const LOCK_FILES = [
-    "package-lock.json",
-    "yarn.lock"
+    'package-lock.json',
+    'yarn.lock'
 ];
 class ProjectRepository {
     // Constructor
     constructor(logger){
         this._cache = new Map();
         this._roots = new Map();
-        this._logger = logger.child(withLabel("projects"));
+        this._logger = logger.child(withLabel('projects'));
     }
     // Methods
     async isProjectRoot(dir) {
@@ -682,17 +682,17 @@ class LoadProject {
     }
     // Methods
     builder(parser) {
-        return parser.option("project", {
-            alias: "p",
-            type: "string",
-            description: "Project root directory"
-        }).option("package-manager", {
+        return parser.option('project', {
+            alias: 'p',
+            type: 'string',
+            description: 'Project root directory'
+        }).option('package-manager', {
             choices: [
-                "yarn",
-                "npm"
+                'yarn',
+                'npm'
             ],
-            type: "string",
-            description: "Force package manager"
+            type: 'string',
+            description: 'Force package manager'
         });
     }
     async handler(args) {
@@ -719,7 +719,7 @@ container.bind(Project).toDynamicValue(({ container })=>{
     const ctx = container.get(ContextService);
     const prj = ctx.project;
     if (!prj) {
-        throw new Error("Cannot inject current project, it not yet defined");
+        throw new Error('Cannot inject current project, it not yet defined');
     }
     return prj;
 }).whenTargetNamed(CURRENT);
@@ -732,10 +732,10 @@ class LoadWorkspace {
     }
     // Methods
     builder(parser) {
-        return parser.option("workspace", {
-            alias: "w",
-            type: "string",
-            desc: "Workspace to use"
+        return parser.option('workspace', {
+            alias: 'w',
+            type: 'string',
+            desc: 'Workspace to use'
         });
     }
     async handler(args) {
@@ -750,8 +750,8 @@ class LoadWorkspace {
             }
         }
         if (!workspace) {
-            this.logger.error(`${symbols.error} Workspace "${args.workspace || "."}" not found`);
-            throw new ExitException(1, "Workspace not found");
+            this.logger.error(`${symbols.error} Workspace "${args.workspace || '.'}" not found`);
+            throw new ExitException(1, 'Workspace not found');
         } else {
             this.context.workspace = workspace;
         }
@@ -773,7 +773,7 @@ container.bind(Workspace).toDynamicValue(({ container })=>{
     const ctx = container.get(ContextService);
     const wks = ctx.workspace;
     if (!wks) {
-        throw new Error("Cannot inject current workspace, it not yet defined");
+        throw new Error('Cannot inject current workspace, it not yet defined');
     }
     return wks;
 }).whenTargetNamed(CURRENT);
@@ -809,7 +809,7 @@ class TaskSyntaxError extends Error {
 class TaskExpressionService {
     // Statics
     static isTaskNode(node) {
-        return "script" in node;
+        return 'script' in node;
     }
     static{
         this._sequenceOperatorWarn = true;
@@ -822,47 +822,47 @@ class TaskExpressionService {
     _lexer() {
         return moo.states({
             task: {
-                lparen: "(",
+                lparen: '(',
                 whitespace: /[ \t]+/,
                 script: {
                     match: /[-_:a-zA-Z0-9]+/,
-                    push: "operatorOrArgument"
+                    push: 'operatorOrArgument'
                 },
                 string: [
                     {
                         match: /'(?:\\['\\]|[^\r\n'\\])+'/,
-                        push: "operator",
-                        value: (x)=>x.slice(1, -1).replace(/\\(['\\])/g, "$1")
+                        push: 'operator',
+                        value: (x)=>x.slice(1, -1).replace(/\\(['\\])/g, '$1')
                     },
                     {
                         match: /"(?:\\["\\]|[^\r\n"\\])+"/,
-                        push: "operator",
-                        value: (x)=>x.slice(1, -1).replace(/\\(["\\])/g, "$1")
+                        push: 'operator',
+                        value: (x)=>x.slice(1, -1).replace(/\\(["\\])/g, '$1')
                     }
                 ]
             },
             operator: {
-                rparen: ")",
+                rparen: ')',
                 whitespace: /[ \t]+/,
                 operator: {
                     match: [
-                        "->",
-                        "&&",
-                        "//",
-                        "||"
+                        '->',
+                        '&&',
+                        '//',
+                        '||'
                     ],
                     pop: 1
                 }
             },
             operatorOrArgument: {
-                rparen: ")",
+                rparen: ')',
                 whitespace: /[ \t]+/,
                 operator: {
                     match: [
-                        "->",
-                        "&&",
-                        "//",
-                        "||"
+                        '->',
+                        '&&',
+                        '//',
+                        '||'
                     ],
                     pop: 1
                 },
@@ -872,11 +872,11 @@ class TaskExpressionService {
                     },
                     {
                         match: /'(?:\\['\\]|[^\r\n'\\])+'/,
-                        value: (x)=>x.slice(1, -1).replace(/\\(['\\])/g, "$1")
+                        value: (x)=>x.slice(1, -1).replace(/\\(['\\])/g, '$1')
                     },
                     {
                         match: /"(?:\\["\\]|[^\r\n"\\])+"/,
-                        value: (x)=>x.slice(1, -1).replace(/\\(["\\])/g, "$1")
+                        value: (x)=>x.slice(1, -1).replace(/\\(["\\])/g, '$1')
                     }
                 ]
             }
@@ -886,23 +886,23 @@ class TaskExpressionService {
         let node = null;
         for (const token of lexer){
             // Ignore whitespaces
-            if (token.type === "whitespace") {
+            if (token.type === 'whitespace') {
                 continue;
             }
             // rparen = end of group
-            if (token.type === "rparen") {
+            if (token.type === 'rparen') {
                 break;
             }
             // Handle argument
-            if (token.type === "argument") {
+            if (token.type === 'argument') {
                 if (!node) {
-                    throw new TaskSyntaxError(lexer.formatError(token, "Unexpected argument"));
+                    throw new TaskSyntaxError(lexer.formatError(token, 'Unexpected argument'));
                 } else if (TaskExpressionService.isTaskNode(node)) {
                     node.args.push(token.value);
                 } else {
                     const lastTask = node.tasks[node.tasks.length - 1];
                     if (!lastTask || !TaskExpressionService.isTaskNode(lastTask)) {
-                        throw new TaskSyntaxError(lexer.formatError(token, "Unexpected argument"));
+                        throw new TaskSyntaxError(lexer.formatError(token, 'Unexpected argument'));
                     } else {
                         lastTask.args.push(token.value);
                     }
@@ -910,10 +910,10 @@ class TaskExpressionService {
                 continue;
             }
             // Handle operator
-            if (token.type === "operator") {
+            if (token.type === 'operator') {
                 const operator = token.value;
                 if (!node) {
-                    throw new TaskSyntaxError(lexer.formatError(token, "Unexpected operator"));
+                    throw new TaskSyntaxError(lexer.formatError(token, 'Unexpected operator'));
                 } else if (TaskExpressionService.isTaskNode(node)) {
                     node = {
                         operator,
@@ -936,30 +936,30 @@ class TaskExpressionService {
             }
             // Build "child"
             let child;
-            if (token.type === "script") {
+            if (token.type === 'script') {
                 child = {
                     script: token.value,
                     args: []
                 };
-            } else if (token.type === "string") {
+            } else if (token.type === 'string') {
                 const [script, ...args] = token.value.split(/ +/);
                 child = {
                     script,
                     args
                 };
-            } else if (token.type === "lparen") {
+            } else if (token.type === 'lparen') {
                 const res = this._nextNode(lexer, i + 1);
                 if (!res) {
-                    throw new TaskSyntaxError(lexer.formatError(token, "Empty group found"));
+                    throw new TaskSyntaxError(lexer.formatError(token, 'Empty group found'));
                 }
                 child = res;
             } else {
-                throw new TaskSyntaxError(lexer.formatError(token, "Unexpected token"));
+                throw new TaskSyntaxError(lexer.formatError(token, 'Unexpected token'));
             }
             if (!node) {
                 node = child;
             } else if (TaskExpressionService.isTaskNode(node)) {
-                throw new TaskSyntaxError(lexer.formatError(token, "Unexpected token, expected an operator"));
+                throw new TaskSyntaxError(lexer.formatError(token, 'Unexpected token, expected an operator'));
             } else {
                 node.tasks.push(child);
             }
@@ -983,7 +983,7 @@ class TaskExpressionService {
         return tree;
     }
     *extractScripts(node) {
-        if ("roots" in node) {
+        if ('roots' in node) {
             for (const child of node.roots){
                 yield* this.extractScripts(child);
             }
@@ -1004,24 +1004,24 @@ class TaskExpressionService {
             return task;
         } else {
             let group;
-            if (node.operator === "//") {
-                group = new ParallelGroup("In parallel", {
+            if (node.operator === '//') {
+                group = new ParallelGroup('In parallel', {
                     workspace
                 }, {
                     logger: this._logger
                 });
-            } else if (node.operator === "||") {
-                group = new FallbackGroup("Fallbacks", {
+            } else if (node.operator === '||') {
+                group = new FallbackGroup('Fallbacks', {
                     workspace
                 }, {
                     logger: this._logger
                 });
             } else {
-                if (node.operator === "->" && TaskExpressionService._sequenceOperatorWarn) {
-                    this._logger.warn("Sequence operator -> is deprecated in favor of &&. It will be removed in a next major release.");
+                if (node.operator === '->' && TaskExpressionService._sequenceOperatorWarn) {
+                    this._logger.warn('Sequence operator -> is deprecated in favor of &&. It will be removed in a next major release.');
                     TaskExpressionService._sequenceOperatorWarn = true;
                 }
-                group = new SequenceGroup("In sequence", {
+                group = new SequenceGroup('In sequence', {
                     workspace
                 }, {
                     logger: this._logger
@@ -1041,11 +1041,11 @@ TaskExpressionService = _([
 
 // Utils
 const style = (dev)=>({
-        color: dev ? "blue" : ""
+        color: dev ? 'blue' : ''
     });
 // Component
 function WorkspaceTree(props) {
-    const { workspace: wks, dev = false, level = "" } = props;
+    const { workspace: wks, dev = false, level = '' } = props;
     // State
     const [deps, setDeps] = useState([]);
     // Effects
@@ -1088,9 +1088,9 @@ function WorkspaceTree(props) {
                         /*#__PURE__*/ jsxs(Text, {
                             ...style(dev),
                             children: [
-                                idx === deps.length - 1 ? "└" : "├",
+                                idx === deps.length - 1 ? '└' : '├',
                                 "─",
-                                " "
+                                ' '
                             ]
                         }),
                         /*#__PURE__*/ jsx(WorkspaceTree, {
@@ -1102,8 +1102,8 @@ function WorkspaceTree(props) {
                                     /*#__PURE__*/ jsxs(Text, {
                                         ...style(dev),
                                         children: [
-                                            idx === deps.length - 1 ? " " : "│",
-                                            "  "
+                                            idx === deps.length - 1 ? ' ' : '│',
+                                            '  '
                                         ]
                                     })
                                 ]
@@ -1117,4 +1117,4 @@ function WorkspaceTree(props) {
 }
 
 export { AffectedFilter as A, GitService as G, LoadProject as L, Pipeline as P, ScriptsFilter as S, TaskExpressionService as T, WorkspaceTree as W, PrivateFilter as a, LazyCurrentProject as b, LoadWorkspace as c, LazyCurrentWorkspace as d, PluginModule as e, Plugin as f, Project as g, ProjectRepository as h, Workspace as i, combine as j, TaskExpressionError as k, TaskSyntaxError as l, streamLines as s };
-//# sourceMappingURL=workspace-tree-BJ9EO1FB.js.map
+//# sourceMappingURL=workspace-tree-VWKE0B6b.js.map