@lenne.tech/cli 1.9.5 → 1.10.0

package/build/commands/server/create.js

@@ -18,7 +18,7 @@ const NewCommand = {
     hidden: false,
     name: 'create',
     run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
         // Retrieve the tools we need
         const { config, filesystem, git, helper, meta, parameters, print: { error, info, spin, success }, prompt: { ask, confirm }, server, strings: { kebabCase }, system, } = toolbox;
         // Handle --help-json flag
@@ -62,6 +62,7 @@ const NewCommand = {
         const configCopy = (_q = (_p = (_o = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _o === void 0 ? void 0 : _o.server) === null || _p === void 0 ? void 0 : _p.create) === null || _q === void 0 ? void 0 : _q.copy;
         const configLink = (_t = (_s = (_r = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _r === void 0 ? void 0 : _r.server) === null || _s === void 0 ? void 0 : _s.create) === null || _t === void 0 ? void 0 : _t.link;
         const configApiMode = (_w = (_v = (_u = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _u === void 0 ? void 0 : _u.server) === null || _v === void 0 ? void 0 : _v.create) === null || _w === void 0 ? void 0 : _w.apiMode;
+        const configFrameworkMode = (_z = (_y = (_x = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _x === void 0 ? void 0 : _x.server) === null || _y === void 0 ? void 0 : _y.create) === null || _z === void 0 ? void 0 : _z.frameworkMode;
         // Load global defaults
         const globalAuthor = config.getGlobalDefault(ltConfig, 'author');
         const globalApiMode = config.getGlobalDefault(ltConfig, 'apiMode');
@@ -74,10 +75,12 @@ const NewCommand = {
         const cliCopy = parameters.options.copy || parameters.options.c;
         const cliLink = parameters.options.link;
         const cliApiMode = parameters.options['api-mode'] || parameters.options.apiMode;
+        const cliFrameworkMode = parameters.options['framework-mode'];
+        const cliFrameworkUpstreamBranch = parameters.options['framework-upstream-branch'];
         // Determine noConfirm with priority: CLI > config > global > default (false)
         const noConfirm = config.getNoConfirm({
             cliValue: cliNoConfirm,
-            commandConfig: (_y = (_x = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _x === void 0 ? void 0 : _x.server) === null || _y === void 0 ? void 0 : _y.create,
+            commandConfig: (_1 = (_0 = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _0 === void 0 ? void 0 : _0.server) === null || _1 === void 0 ? void 0 : _1.create,
             config: ltConfig,
         });
         // Start timer
@@ -178,6 +181,39 @@ const NewCommand = {
             ]);
             apiMode = apiModeChoice.apiMode.split(' - ')[0];
         }
+        // Determine framework consumption mode — same resolution cascade as
+        // lt fullstack init: CLI flag > lt.config > interactive (default npm).
+        let frameworkMode;
+        if (cliFrameworkMode === 'npm' || cliFrameworkMode === 'vendor') {
+            frameworkMode = cliFrameworkMode;
+        }
+        else if (cliFrameworkMode) {
+            error(`Invalid --framework-mode value "${cliFrameworkMode}". Use "npm" or "vendor".`);
+            return;
+        }
+        else if (configFrameworkMode === 'npm' || configFrameworkMode === 'vendor') {
+            frameworkMode = configFrameworkMode;
+            info(`Using framework mode from lt.config: ${frameworkMode}`);
+        }
+        else if (noConfirm) {
+            frameworkMode = 'npm';
+        }
+        else {
+            const frameworkModeChoice = yield ask({
+                choices: [
+                    'npm    - @lenne.tech/nest-server as npm dependency (classic, stable)',
+                    'vendor - framework core vendored into src/core/ (pilot, allows local patches)',
+                ],
+                initial: 0,
+                message: 'Framework consumption mode?',
+                name: 'frameworkMode',
+                type: 'select',
+            });
+            frameworkMode = frameworkModeChoice.frameworkMode.startsWith('vendor') ? 'vendor' : 'npm';
+        }
+        const frameworkUpstreamBranch = typeof cliFrameworkUpstreamBranch === 'string' && cliFrameworkUpstreamBranch.length > 0
+            ? cliFrameworkUpstreamBranch
+            : undefined;
         // Setup server using Server extension
         const setupSpinner = spin(`Setting up server${linkPath ? ' (link)' : copyPath ? ' (copy)' : branch ? ` (branch: ${branch})` : ''}`);
         const result = yield server.setupServer(`./${projectDir}`, {
@@ -186,6 +222,8 @@ const NewCommand = {
             branch,
             copyPath,
             description,
+            frameworkMode,
+            frameworkUpstreamBranch,
             linkPath,
             name,
             projectDir,
@@ -213,7 +251,7 @@ const NewCommand = {
         }
         // Git initialization (after npm install which is done in setupServer)
         if (git) {
-            const inGit = (_z = (yield system.run('git rev-parse --is-inside-work-tree'))) === null || _z === void 0 ? void 0 : _z.trim();
+            const inGit = (_2 = (yield system.run('git rev-parse --is-inside-work-tree'))) === null || _2 === void 0 ? void 0 : _2.trim();
             if (inGit !== 'true') {
                 // Determine initGit with priority: CLI > config > interactive
                 let initializeGit;
@@ -280,4 +318,3 @@ const NewCommand = {
     }),
 };
 exports.default = NewCommand;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/server/create.ts"],"names":[],"mappings":";;;;;;;;;;;AAIA;;GAEG;AACH,MAAM,UAAU,GAAmB;IACjC,KAAK,EAAE,CAAC,GAAG,CAAC;IACZ,WAAW,EAAE,mBAAmB;IAChC,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,QAAQ;IACd,GAAG,EAAE,CAAO,OAA+B,EAAE,EAAE;;QAC7C,6BAA6B;QAC7B,MAAM,EACJ,MAAM,EACN,UAAU,EACV,GAAG,EACH,MAAM,EACN,IAAI,EACJ,UAAU,EACV,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EACrC,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EACxB,MAAM,EACN,OAAO,EAAE,EAAE,SAAS,EAAE,EACtB,MAAM,GACP,GAAG,OAAO,CAAC;QAEZ,0BAA0B;QAC1B,IACE,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;YACrB,OAAO,EAAE,CAAC,GAAG,CAAC;YACd,aAAa,EAAE,0BAA0B;YACzC,WAAW,EAAE,mBAAmB;YAChC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE;gBACP,EAAE,WAAW,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC9E;oBACE,WAAW,EAAE,UAAU;oBACvB,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,KAAK;oBACf,IAAI,EAAE,QAAQ;oBACd,MAAM,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC;iBACpC;gBACD,EAAE,WAAW,EAAE,qBAAqB,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC9F,EAAE,WAAW,EAAE,gBAAgB,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;gBACpF,EAAE,WAAW,EAAE,2BAA2B,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC7F,EAAE,WAAW,EAAE,0BAA0B,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC9F,EAAE,WAAW,EAAE,yCAAyC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC3G,EAAE,WAAW,EAAE,0CAA0C,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC5G;oBACE,OAAO,EAAE,KAAK;oBACd,WAAW,EAAE,8BAA8B;oBAC3C,IAAI,EAAE,aAAa;oBACnB,QAAQ,EAAE,KAAK;oBACf,IAAI,EAAE,SAAS;iBAChB;aACF;SACF,CAAC,EACF,CAAC;YACD,OAAO;QACT,CAAC;QAED,qBAAqB;QACrB,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACrC,MAAM,SAAS,GAAG,MAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,0CAAE,MAAM,0CAAE,MAAM,0CAAE,GAAG,CAAC;QAC1D,MAAM,YAAY,GAAG,MAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,0CAAE,MAAM,0CAAE,MAAM,0CAAE,MAAM,CAAC;QAChE,MAAM,iBAAiB,GAAG,MAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,0CAAE,MAAM,0CAAE,MAAM,0CAAE,WAAW,CAAC;QAC1E,MAAM,YAAY,GAAG,MAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,0CAAE,MAAM,0CAAE,MAAM,0CAAE,MAAM,CAAC;QAChE,MAAM,UAAU,GAAG,MAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,0CAAE,MAAM,0CAAE,MAAM,0CAAE,IAAI,CAAC;QAC5D,MAAM,UAAU,GAAG,MAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,0CAAE,MAAM,0CAAE,MAAM,0CAAE,IAAI,CAAC;QAC5D,MAAM,aAAa,GAAG,MAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,0CAAE,MAAM,0CAAE,MAAM,0CAAE,OAAO,CAAC;QAElE,uBAAuB;QACvB,MAAM,YAAY,GAAG,MAAM,CAAC,gBAAgB,CAAS,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACzE,MAAM,aAAa,GAAG,MAAM,CAAC,gBAAgB,CAA8B,QAAQ,EAAE,SAAS,CAAC,CAAC;QAEhG,sBAAsB;QACtB,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC;QACtC,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC;QAC5C,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC;QACtD,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC;QAClD,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QAChE,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;QACxC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC;QAEhF,6EAA6E;QAC7E,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC;YACpC,QAAQ,EAAE,YAAY;YACtB,aAAa,EAAE,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,0CAAE,MAAM,0CAAE,MAAM;YACjD,MAAM,EAAE,QAAQ;SACjB,CAAC,CAAC;QAEH,cAAc;QACd,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAElC,OAAO;QACP,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAE5B,sDAAsD;QACtD,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,2EAA2E,CAAC,CAAC;QAE9G,YAAY;QACZ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED,WAAW;QACX,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE;YACnD,IAAI,EAAE,aAAa;YACnB,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,wBAAwB;QACxB,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAEnC,oCAAoC;QACpC,IAAI,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,EAAE,CAAC,CAAC;YACT,KAAK,CAAC,mCAAmC,UAAU,SAAS,CAAC,CAAC;YAC9D,OAAO;QACT,CAAC;QAED,wDAAwD;QACxD,MAAM,QAAQ,GAAG,OAAO,IAAI,UAAU,CAAC;QACvC,MAAM,QAAQ,GAAG,OAAO,IAAI,UAAU,CAAC;QAEvC,+CAA+C;QAC/C,MAAM,MAAM,GAAG,SAAS,IAAI,YAAY,CAAC;QAEzC,kEAAkE;QAClE,IAAI,WAAmB,CAAC;QACxB,IAAI,cAAc,EAAE,CAAC;YACnB,WAAW,GAAG,cAAc,CAAC;QAC/B,CAAC;aAAM,IAAI,iBAAiB,EAAE,CAAC;YAC7B,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACxD,IAAI,CAAC,qCAAqC,WAAW,EAAE,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,WAAW,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE;gBACrD,IAAI,EAAE,aAAa;gBACnB,SAAS,EAAE,KAAK;aACjB,CAAC,CAAC;QACL,CAAC;QAED,sEAAsE;QACtE,IAAI,MAAc,CAAC;QACnB,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,GAAG,SAAS,CAAC;QACrB,CAAC;aAAM,IAAI,YAAY,EAAE,CAAC;YACxB,MAAM,GAAG,YAAY,CAAC;YACtB,IAAI,CAAC,uDAAuD,MAAM,EAAE,CAAC,CAAC;QACxE,CAAC;aAAM,IAAI,YAAY,EAAE,CAAC;YACxB,MAAM,GAAG,YAAY,CAAC;YACtB,IAAI,CAAC,yCAAyC,MAAM,EAAE,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACjC,IAAI,EAAE,QAAQ;gBACd,SAAS,EAAE,KAAK;aACjB,CAAC,CAAC;QACL,CAAC;QAED,wFAAwF;QACxF,IAAI,OAAoC,CAAC;QACzC,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,GAAG,UAAyC,CAAC;QACtD,CAAC;aAAM,IAAI,aAAa,EAAE,CAAC;YACzB,OAAO,GAAG,aAAa,CAAC;YACxB,IAAI,CAAC,yDAAyD,OAAO,EAAE,CAAC,CAAC;QAC3E,CAAC;aAAM,IAAI,aAAa,EAAE,CAAC;YACzB,OAAO,GAAG,aAAa,CAAC;YACxB,IAAI,CAAC,2CAA2C,OAAO,EAAE,CAAC,CAAC;QAC7D,CAAC;aAAM,IAAI,SAAS,EAAE,CAAC;YACrB,OAAO,GAAG,MAAM,CAAC;YACjB,IAAI,CAAC,kCAAkC,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACN,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC;gBAC9B;oBACE,OAAO,EAAE;wBACP,8DAA8D;wBAC9D,0CAA0C;wBAC1C,kDAAkD;qBACnD;oBACD,OAAO,EAAE,CAAC;oBACV,OAAO,EAAE,WAAW;oBACpB,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,QAAQ;iBACf;aACF,CAAC,CAAC;YACH,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAgC,CAAC;QACjF,CAAC;QAED,sCAAsC;QACtC,MAAM,YAAY,GAAG,IAAI,CACvB,oBAAoB,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACzG,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,KAAK,UAAU,EAAE,EAAE;YACzD,OAAO;YACP,MAAM;YACN,MAAM;YACN,QAAQ;YACR,WAAW;YACX,QAAQ;YACR,IAAI;YACJ,UAAU;SACX,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,YAAY,CAAC,IAAI,CAAC,4BAA4B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC7D,OAAO;QACT,CAAC;QAED,YAAY,CAAC,OAAO,CAAC,2BAA2B,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAElE,0CAA0C;QAC1C,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC7B,IAAI,CAAC,EAAE,CAAC,CAAC;YACT,OAAO,CAAC,mBAAmB,UAAU,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,EAAE,CAAC,CAAC;YACT,IAAI,CAAC,sEAAsE,CAAC,CAAC;YAC7E,IAAI,CAAC,EAAE,CAAC,CAAC;YACT,IAAI,CAAC,OAAO,CAAC,CAAC;YACd,IAAI,CAAC,iCAAiC,UAAU,EAAE,CAAC,CAAC;YACpD,IAAI,CAAC,mBAAmB,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACnD,IAAI,CAAC,EAAE,CAAC,CAAC;YAET,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;gBAChD,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,CAAC;YACD,OAAO,0BAA0B,IAAI,EAAE,CAAC;QAC1C,CAAC;QAED,sEAAsE;QACtE,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,KAAK,GAAG,MAAA,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC,0CAAE,IAAI,EAAE,CAAC;YAChF,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;gBACrB,8DAA8D;gBAC9D,IAAI,aAAsB,CAAC;gBAC3B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;oBACzB,aAAa,GAAG,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,MAAM,CAAC;gBACvD,CAAC;qBAAM,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;oBACnC,aAAa,GAAG,SAAS,CAAC;oBAC1B,IAAI,aAAa,EAAE,CAAC;wBAClB,IAAI,CAAC,0DAA0D,CAAC,CAAC;oBACnE,CAAC;gBACH,CAAC;qBAAM,IAAI,SAAS,EAAE,CAAC;oBACrB,aAAa,GAAG,KAAK,CAAC,CAAC,kEAAkE;gBAC3F,CAAC;qBAAM,CAAC;oBACN,aAAa,GAAG,MAAM,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;gBACzD,CAAC;gBACD,IAAI,aAAa,EAAE,CAAC;oBAClB,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;oBAC9C,MAAM,MAAM,CAAC,GAAG,CACd,MAAM,UAAU,wEAAwE,IAAI,CAAC,OAAO,EAAE,GAAG,CAC1G,CAAC;oBACF,cAAc,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;QACH,CAAC;QAED,+DAA+D;QAC/D,MAAM,cAAc,GAAgC,OAAO,CAAC;QAE5D,wBAAwB;QACxB,MAAM,aAAa,GAAG;YACpB,QAAQ,EAAE;gBACR,MAAM,EAAE;oBACN,MAAM,EAAE;wBACN,UAAU,EAAE,cAAc;qBAC3B;iBACF;aACF;YACD,IAAI,EAAE;gBACJ,OAAO;gBACP,OAAO,EAAE,OAAO;aACjB;SACF,CAAC;QAEF,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QACjE,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;QAE/D,IAAI,CAAC,EAAE,CAAC,CAAC;QACT,OAAO,CAAC,0BAA0B,UAAU,iBAAiB,CAAC,CAAC;QAC/D,IAAI,CAAC,gBAAgB,OAAO,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,+BAA+B,cAAc,EAAE,CAAC,CAAC;QAEtD,sCAAsC;QACtC,IAAI,CAAC,EAAE,CAAC,CAAC;QACT,OAAO,CACL,aAAa,IAAI,+BAA+B,IAAI,CAAC,OAAO,EAAE,OAAO,MAAM,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC,IAAI,CAC/G,CAAC;QACF,IAAI,CAAC,EAAE,CAAC,CAAC;QACT,IAAI,CAAC,OAAO,CAAC,CAAC;QACd,IAAI,CAAC,wCAAwC,CAAC,CAAC;QAC/C,IAAI,CAAC,mBAAmB,UAAU,oBAAoB,CAAC,CAAC;QACxD,IAAI,CAAC,iCAAiC,UAAU,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,gBAAgB,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,mBAAmB,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,EAAE,CAAC,CAAC;QAET,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAChD,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,CAAC;QAED,YAAY;QACZ,OAAO,kBAAkB,IAAI,EAAE,CAAC;IAClC,CAAC,CAAA;CACF,CAAC;AAEF,kBAAe,UAAU,CAAC"}

package/build/commands/server/module.js

@@ -8,9 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
-const object_1 = require("./object");
+const framework_detection_1 = require("../../lib/framework-detection");
+const object_1 = __importDefault(require("./object"));
 /**
  * Detect controller type based on existing modules
  * Analyzes project modules (excluding base modules) to determine common pattern
@@ -269,27 +273,43 @@ const NewCommand = {
         const inputTemplate = server.propsForInput(props, { modelName: name, nullable: true });
         const createTemplate = server.propsForInput(props, { create: true, modelName: name, nullable: false });
         const modelTemplate = server.propsForModel(props, { modelName: name });
+        // Compute the correct framework-import specifier for each generated file.
+        // In vendored projects this resolves to a relative path to src/core (depth
+        // depends on file location); in npm projects it stays '@lenne.tech/nest-server'.
+        const importFor = (target) => (0, framework_detection_1.getFrameworkImportSpecifier)(path, target);
         // nest-server-module/inputs/xxx.input.ts
+        const inputTarget = (0, path_1.join)(directory, 'inputs', `${nameKebab}.input.ts`);
         yield template.generate({
-            props: { imports: inputTemplate.imports, nameCamel, nameKebab, namePascal, props: inputTemplate.props },
-            target: (0, path_1.join)(directory, 'inputs', `${nameKebab}.input.ts`),
+            props: {
+                frameworkImport: importFor(inputTarget),
+                imports: inputTemplate.imports,
+                nameCamel,
+                nameKebab,
+                namePascal,
+                props: inputTemplate.props,
+            },
+            target: inputTarget,
             template: 'nest-server-module/inputs/template.input.ts.ejs',
         });
         if (controller === 'Rest' || controller === 'Both') {
+            const controllerTarget = (0, path_1.join)(directory, `${nameKebab}.controller.ts`);
             yield template.generate({
                 props: {
+                    frameworkImport: importFor(controllerTarget),
                     lowercase: name.toLowerCase(),
                     nameCamel: camelCase(name),
                     nameKebab: kebabCase(name),
                     namePascal: pascalCase(name),
                 },
-                target: (0, path_1.join)(directory, `${nameKebab}.controller.ts`),
+                target: controllerTarget,
                 template: 'nest-server-module/template.controller.ts.ejs',
             });
         }
         // nest-server-module/inputs/xxx-create.input.ts
+        const createInputTarget = (0, path_1.join)(directory, 'inputs', `${nameKebab}-create.input.ts`);
         yield template.generate({
             props: {
+                frameworkImport: importFor(createInputTarget),
                 imports: createTemplate.imports,
                 isGql: controller === 'GraphQL' || controller === 'Both',
                 nameCamel,
@@ -297,18 +317,27 @@ const NewCommand = {
                 namePascal,
                 props: createTemplate.props,
             },
-            target: (0, path_1.join)(directory, 'inputs', `${nameKebab}-create.input.ts`),
+            target: createInputTarget,
             template: 'nest-server-module/inputs/template-create.input.ts.ejs',
         });
         // nest-server-module/output/find-and-count-xxxs-result.output.ts
+        const facOutputTarget = (0, path_1.join)(directory, 'outputs', `find-and-count-${nameKebab}s-result.output.ts`);
         yield template.generate({
-            props: { isGql: controller === 'GraphQL' || controller === 'Both', nameCamel, nameKebab, namePascal },
-            target: (0, path_1.join)(directory, 'outputs', `find-and-count-${nameKebab}s-result.output.ts`),
+            props: {
+                frameworkImport: importFor(facOutputTarget),
+                isGql: controller === 'GraphQL' || controller === 'Both',
+                nameCamel,
+                nameKebab,
+                namePascal,
+            },
+            target: facOutputTarget,
             template: 'nest-server-module/outputs/template-fac-result.output.ts.ejs',
         });
         // nest-server-module/xxx.model.ts
+        const modelTarget = (0, path_1.join)(directory, `${nameKebab}.model.ts`);
         yield template.generate({
             props: {
+                frameworkImport: importFor(modelTarget),
                 imports: modelTemplate.imports,
                 isGql: controller === 'GraphQL' || controller === 'Both',
                 mappings: modelTemplate.mappings,
@@ -317,27 +346,36 @@ const NewCommand = {
                 namePascal,
                 props: modelTemplate.props,
             },
-            target: (0, path_1.join)(directory, `${nameKebab}.model.ts`),
+            target: modelTarget,
             template: 'nest-server-module/template.model.ts.ejs',
         });
         // nest-server-module/xxx.module.ts
+        const moduleTarget = (0, path_1.join)(directory, `${nameKebab}.module.ts`);
         yield template.generate({
-            props: { controller, nameCamel, nameKebab, namePascal },
-            target: (0, path_1.join)(directory, `${nameKebab}.module.ts`),
+            props: { controller, frameworkImport: importFor(moduleTarget), nameCamel, nameKebab, namePascal },
+            target: moduleTarget,
             template: 'nest-server-module/template.module.ts.ejs',
         });
         if (controller === 'GraphQL' || controller === 'Both') {
             // nest-server-module/xxx.resolver.ts
+            const resolverTarget = (0, path_1.join)(directory, `${nameKebab}.resolver.ts`);
             yield template.generate({
-                props: { nameCamel, nameKebab, namePascal },
-                target: (0, path_1.join)(directory, `${nameKebab}.resolver.ts`),
+                props: { frameworkImport: importFor(resolverTarget), nameCamel, nameKebab, namePascal },
+                target: resolverTarget,
                 template: 'nest-server-module/template.resolver.ts.ejs',
             });
         }
         // nest-server-module/xxx.service.ts
+        const serviceTarget = (0, path_1.join)(directory, `${nameKebab}.service.ts`);
         yield template.generate({
-            props: { isGql: controller === 'GraphQL' || controller === 'Both', nameCamel, nameKebab, namePascal },
-            target: (0, path_1.join)(directory, `${nameKebab}.service.ts`),
+            props: {
+                frameworkImport: importFor(serviceTarget),
+                isGql: controller === 'GraphQL' || controller === 'Both',
+                nameCamel,
+                nameKebab,
+                namePascal,
+            },
+            target: serviceTarget,
             template: 'nest-server-module/template.service.ts.ejs',
         });
         generateSpinner.succeed('Files generated');
@@ -362,20 +400,18 @@ const NewCommand = {
                 });
                 // Ensure forwardRef is imported from @nestjs/common
                 const serverModuleContent = filesystem.read(serverModule);
-                if (serverModuleContent && !serverModuleContent.includes('forwardRef')) {
-                    // Add forwardRef to @nestjs/common import
-                    yield patching.patch(serverModule, {
-                        insert: '$1, forwardRef$2',
-                        replace: /from '@nestjs\/common'(.*?)}/,
-                    });
-                }
-                else if (serverModuleContent &&
+                if (serverModuleContent &&
                     serverModuleContent.includes('@nestjs/common') &&
-                    !serverModuleContent.match(/forwardRef.*@nestjs\/common|@nestjs\/common.*forwardRef/)) {
-                    // forwardRef exists but not in @nestjs/common import - add it
+                    !serverModuleContent.match(/import\s*\{[^}]*forwardRef[^}]*}\s*from\s+['"]@nestjs\/common['"]/)) {
+                    // Add forwardRef into the existing `import { ... } from '@nestjs/common'`
+                    // statement by inserting it before the closing brace. The regex
+                    // captures two groups: (1) everything up to (but not including) the
+                    // closing brace of the named-import list and (2) the closing brace
+                    // plus the `from '@nestjs/common'` clause. The replacement wedges
+                    // `, forwardRef` in between.
                     yield patching.patch(serverModule, {
-                        insert: '$1, forwardRef$2',
-                        replace: /(\w+)\s*}\s*from\s+'@nestjs\/common'/,
+                        insert: "$1, forwardRef$2",
+                        replace: /(import\s*\{\s*[^}]*?)(\s*\}\s*from\s+['"]@nestjs\/common['"])/,
                     });
                 }
             }
@@ -482,4 +518,3 @@ const NewCommand = {
     }),
 };
 exports.default = NewCommand;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/commands/server/module.ts"],"names":[],"mappings":"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"}

package/build/commands/server/object.js

@@ -8,9 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
-const module_1 = require("./module");
+const framework_detection_1 = require("../../lib/framework-detection");
+const module_1 = __importDefault(require("./module"));
 /**
  * Create a new server object
  */
@@ -130,21 +134,41 @@ const NewCommand = {
         const inputTemplate = server.propsForInput(props, { modelName: name, nullable: true });
         const createTemplate = server.propsForInput(props, { create: true, modelName: name, nullable: false });
         const objectTemplate = server.propsForModel(props, { modelName: name });
+        // Framework-import specifier (bare in npm mode, relative in vendored mode)
+        const importFor = (target) => (0, framework_detection_1.getFrameworkImportSpecifier)(path, target);
         // nest-server-module/inputs/xxx.input.ts
+        const inputTarget = (0, path_1.join)(directory, `${nameKebab}.input.ts`);
         yield template.generate({
-            props: { imports: inputTemplate.imports, nameCamel, nameKebab, namePascal, props: inputTemplate.props },
-            target: (0, path_1.join)(directory, `${nameKebab}.input.ts`),
+            props: {
+                frameworkImport: importFor(inputTarget),
+                imports: inputTemplate.imports,
+                nameCamel,
+                nameKebab,
+                namePascal,
+                props: inputTemplate.props,
+            },
+            target: inputTarget,
             template: 'nest-server-object/template.input.ts.ejs',
         });
         // nest-server-object/inputs/xxx-create.input.ts
+        const createInputTarget = (0, path_1.join)(directory, `${nameKebab}-create.input.ts`);
         yield template.generate({
-            props: { imports: createTemplate.imports, nameCamel, nameKebab, namePascal, props: createTemplate.props },
-            target: (0, path_1.join)(directory, `${nameKebab}-create.input.ts`),
+            props: {
+                frameworkImport: importFor(createInputTarget),
+                imports: createTemplate.imports,
+                nameCamel,
+                nameKebab,
+                namePascal,
+                props: createTemplate.props,
+            },
+            target: createInputTarget,
             template: 'nest-server-object/template-create.input.ts.ejs',
         });
         // nest-server-module/xxx.model.ts
+        const objectTarget = (0, path_1.join)(directory, `${nameKebab}.object.ts`);
         yield template.generate({
             props: {
+                frameworkImport: importFor(objectTarget),
                 imports: objectTemplate.imports,
                 mappings: objectTemplate.mappings,
                 nameCamel,
@@ -152,7 +176,7 @@ const NewCommand = {
                 namePascal,
                 props: objectTemplate.props,
             },
-            target: (0, path_1.join)(directory, `${nameKebab}.object.ts`),
+            target: objectTarget,
             template: 'nest-server-object/template.object.ts.ejs',
         });
         generateSpinner.succeed('Files generated');
@@ -229,4 +253,3 @@ const NewCommand = {
     }),
 };
 exports.default = NewCommand;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../src/commands/server/object.ts"],"names":[],"mappings":"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"}

package/build/commands/server/permissions.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const framework_detection_1 = require("../../lib/framework-detection");
 // ────────────────────────────────────────────────────────────────────────────
 // Helper functions (alphabetically sorted per ESLint rules)
 // ────────────────────────────────────────────────────────────────────────────
@@ -82,11 +83,23 @@ function generateJson(report, projectPath) {
  */
 function loadScanner(projectPath) {
     return __awaiter(this, void 0, void 0, function* () {
-        // Try 1: Load from project's nest-server (preferred)
-        const scannerPaths = [
-            (0, path_1.join)(projectPath, 'node_modules', '@lenne.tech', 'nest-server', 'dist', 'core', 'modules', 'permissions', 'permissions-scanner'),
-            (0, path_1.join)(projectPath, 'node_modules', '@lenne.tech', 'nest-server', 'dist', 'core', 'modules', 'permissions', 'permissions-scanner.js'),
-        ];
+        // Build an ordered list of candidate paths, mode-aware:
+        //
+        // - Vendored projects: the framework code lives in src/core/ as
+        //   project-compiled TypeScript. After `nest build` the compiled output
+        //   lands under dist/src/core/modules/permissions/. Before the build,
+        //   the .ts source sits at src/core/modules/permissions/permissions-scanner.ts
+        //   (which Node's `require()` cannot load directly). We try the dist
+        //   variant first and fall back to the bundled CLI scanner if the
+        //   project hasn't been built yet.
+        // - npm projects: classic path under node_modules/@lenne.tech/nest-server/dist.
+        const scannerPaths = [];
+        if ((0, framework_detection_1.isVendoredProject)(projectPath)) {
+            scannerPaths.push((0, path_1.join)(projectPath, 'dist', 'src', 'core', 'modules', 'permissions', 'permissions-scanner'), (0, path_1.join)(projectPath, 'dist', 'src', 'core', 'modules', 'permissions', 'permissions-scanner.js'), (0, path_1.join)(projectPath, 'dist', 'core', 'modules', 'permissions', 'permissions-scanner'), (0, path_1.join)(projectPath, 'dist', 'core', 'modules', 'permissions', 'permissions-scanner.js'));
+        }
+        else {
+            scannerPaths.push((0, path_1.join)(projectPath, 'node_modules', '@lenne.tech', 'nest-server', 'dist', 'core', 'modules', 'permissions', 'permissions-scanner'), (0, path_1.join)(projectPath, 'node_modules', '@lenne.tech', 'nest-server', 'dist', 'core', 'modules', 'permissions', 'permissions-scanner.js'));
+        }
         for (const scannerPath of scannerPaths) {
             try {
                 const mod = require(scannerPath);
@@ -101,7 +114,8 @@ function loadScanner(projectPath) {
                 // Not available at this path
             }
         }
-        // Try 2: Use CLI's bundled fallback scanner
+        // Fallback: Use CLI's bundled scanner. Covers both "not yet built" (vendor
+        // mode before `nest build`) and "framework not installed" (detached clone).
         try {
             const fallback = require('../../lib/fallback-scanner');
             if (typeof fallback.scanPermissions === 'function') {
@@ -376,4 +390,3 @@ const PermissionsCommand = {
     }),
 };
 exports.default = PermissionsCommand;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../src/commands/server/permissions.ts"],"names":[],"mappings":"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"}

package/build/commands/server/server.js

@@ -22,4 +22,3 @@ module.exports = {
         return 'server';
     }),
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL3NlcnZlci9zZXJ2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFFQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxPQUFPLEdBQUc7SUFDZixLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUsaUJBQWlCO0lBQzlCLE1BQU0sRUFBRSxJQUFJO0lBQ1osSUFBSSxFQUFFLFFBQVE7SUFDZCxHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7UUFDN0MsTUFBTSxPQUFPLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUN4QyxPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDLENBQUE7Q0FDRixDQUFDIn0=

package/build/commands/server/set-secrets.js

@@ -39,4 +39,3 @@ const NewCommand = {
     }),
 };
 exports.default = NewCommand;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0LXNlY3JldHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvc2VydmVyL3NldC1zZWNyZXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBSUE7O0dBRUc7QUFDSCxNQUFNLFVBQVUsR0FBbUI7SUFDakMsS0FBSyxFQUFFLENBQUMsS0FBSyxDQUFDO0lBQ2QsV0FBVyxFQUFFLG9CQUFvQjtJQUNqQyxNQUFNLEVBQUUsS0FBSztJQUNiLElBQUksRUFBRSxrQkFBa0I7SUFDeEIsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osVUFBVSxFQUNWLFVBQVUsRUFDVixRQUFRLEVBQ1IsS0FBSyxFQUFFLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsRUFDNUIsTUFBTSxHQUNQLEdBQUcsT0FBTyxDQUFDO1FBRVosdUJBQXVCO1FBQ3ZCLE1BQU0sUUFBUSxHQUFHLFVBQVUsQ0FBQyxLQUFLLElBQUksbUJBQW1CLENBQUM7UUFDekQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztZQUNqQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDVCxLQUFLLENBQUMsMEJBQTBCLFFBQVEsR0FBRyxDQUFDLENBQUM7WUFDN0MsT0FBTztRQUNULENBQUM7UUFFRCxjQUFjO1FBQ2QsTUFBTSxjQUFjLEdBQUcsSUFBSSxDQUFDLDRDQUE0QyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQ3BGLE1BQU0sUUFBUSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQywwQkFBMEIsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBQ3pGLGNBQWMsQ0FBQyxPQUFPLENBQUMsdUNBQXVDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFFMUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQ2hELE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNqQixDQUFDO1FBRUQsWUFBWTtRQUNaLE9BQU8scUNBQXFDLENBQUM7SUFDL0MsQ0FBQyxDQUFBO0NBQ0YsQ0FBQztBQUVGLGtCQUFlLFVBQVUsQ0FBQyJ9

package/build/commands/server/test.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
+const framework_detection_1 = require("../../lib/framework-detection");
 /**
  * Create a new server
  */
@@ -55,7 +56,12 @@ const NewCommand = {
         const generateSpinner = spin('Generate test file');
         // nest-server-tests/tests.e2e-spec.ts.ejs
         yield template.generate({
-            props: { nameCamel, nameKebab, namePascal },
+            props: {
+                frameworkImport: (0, framework_detection_1.getFrameworkImportSpecifier)(path, filePath),
+                nameCamel,
+                nameKebab,
+                namePascal,
+            },
             target: filePath,
             template: 'nest-server-tests/tests.e2e-spec.ts.ejs',
         });
@@ -72,4 +78,3 @@ const NewCommand = {
     }),
 };
 exports.default = NewCommand;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9zZXJ2ZXIvdGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUNBLCtCQUE0QjtBQUk1Qjs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUseUJBQXlCO0lBQ3RDLE1BQU0sRUFBRSxLQUFLO0lBQ2IsSUFBSSxFQUFFLE1BQU07SUFDWixHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7UUFDN0MsNkJBQTZCO1FBQzdCLE1BQU0sRUFDSixVQUFVLEVBQ1YsTUFBTSxFQUNOLFVBQVUsRUFDVixLQUFLLEVBQUUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsRUFDckMsT0FBTyxFQUFFLEVBQUUsU0FBUyxFQUFFLFNBQVMsRUFBRSxVQUFVLEVBQUUsRUFDN0MsTUFBTSxFQUNOLFFBQVEsR0FDVCxHQUFHLE9BQU8sQ0FBQztRQUVaLGNBQWM7UUFDZCxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7UUFFbEMsT0FBTztRQUNQLElBQUksQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO1FBRS9CLFdBQVc7UUFDWCxNQUFNLElBQUksR0FBRyxNQUFNLE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRTtZQUNuRCxJQUFJLEVBQUUsV0FBVztTQUNsQixDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDVixPQUFPO1FBQ1QsQ0FBQztRQUVELGdEQUFnRDtRQUNoRCxNQUFNLFNBQVMsR0FBRyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbEMsTUFBTSxTQUFTLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sVUFBVSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVwQyxxQkFBcUI7UUFDckIsTUFBTSxHQUFHLEdBQUcsVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQzdCLE1BQU0sSUFBSSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztRQUNuRCxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFBLFdBQUksRUFBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDO1lBQzVDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNULEtBQUssQ0FBQywwQkFBMEIsSUFBSSxJQUFJLENBQUMsQ0FBQztZQUMxQyxPQUFPO1FBQ1QsQ0FBQztRQUNELE1BQU0sUUFBUSxHQUFHLElBQUEsV0FBSSxFQUFDLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQztRQUNyQyxNQUFNLFFBQVEsR0FBRyxJQUFBLFdBQUksRUFBQyxRQUFRLEVBQUUsR0FBRyxTQUFTLGNBQWMsQ0FBQyxDQUFDO1FBRTVELCtCQUErQjtRQUMvQixJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztZQUNoQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDVCxLQUFLLENBQUMsaUNBQWlDLFFBQVEsR0FBRyxDQUFDLENBQUM7WUFDcEQsT0FBTztRQUNULENBQUM7UUFFRCxNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUVuRCwwQ0FBMEM7UUFDMUMsTUFBTSxRQUFRLENBQUMsUUFBUSxDQUFDO1lBQ3RCLEtBQUssRUFBRSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFO1lBQzNDLE1BQU0sRUFBRSxRQUFRO1lBQ2hCLFFBQVEsRUFBRSx5Q0FBeUM7U0FDcEQsQ0FBQyxDQUFDO1FBRUgsZUFBZSxDQUFDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBRTlDLHNDQUFzQztRQUN0QyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDVCxPQUFPLENBQUMsYUFBYSxVQUFVLGlCQUFpQixNQUFNLENBQUMscUJBQXFCLENBQUMsS0FBSyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDM0YsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRVQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQ2hELE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNqQixDQUFDO1FBRUQsWUFBWTtRQUNaLE9BQU8sWUFBWSxJQUFJLEVBQUUsQ0FBQztJQUM1QixDQUFDLENBQUE7Q0FDRixDQUFDO0FBRUYsa0JBQWUsVUFBVSxDQUFDIn0=

package/build/commands/starter/chrome-extension.js

@@ -117,4 +117,3 @@ const NewCommand = {
     }),
 };
 exports.default = NewCommand;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hyb21lLWV4dGVuc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9zdGFydGVyL2Nocm9tZS1leHRlbnNpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFJQTs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxLQUFLLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDYixXQUFXLEVBQUUsZ0NBQWdDO0lBQzdDLE1BQU0sRUFBRSxLQUFLO0lBQ2IsSUFBSSxFQUFFLGtCQUFrQjtJQUN4QixHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7UUFDN0MsNkJBQTZCO1FBQzdCLE1BQU0sRUFDSixVQUFVLEVBQ1YsR0FBRyxFQUNILE1BQU0sRUFDTixJQUFJLEVBQ0osVUFBVSxFQUNWLFFBQVEsRUFDUixLQUFLLEVBQUUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsRUFDckMsT0FBTyxFQUFFLEVBQUUsU0FBUyxFQUFFLEVBQ3RCLE1BQU0sR0FDUCxHQUFHLE9BQU8sQ0FBQztRQUVaLGNBQWM7UUFDZCxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7UUFFbEMsT0FBTztRQUNQLElBQUksQ0FBQyx1Q0FBdUMsQ0FBQyxDQUFDO1FBRTlDLFlBQVk7UUFDWixJQUFJLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxFQUFFLENBQUM7WUFDaEMsT0FBTztRQUNULENBQUM7UUFFRCxXQUFXO1FBQ1gsTUFBTSxJQUFJLEdBQUcsTUFBTSxNQUFNLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUU7WUFDbkQsSUFBSSxFQUFFLGNBQWM7WUFDcEIsU0FBUyxFQUFFLElBQUk7U0FDaEIsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ1YsT0FBTztRQUNULENBQUM7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

package/build/commands/starter/starter.js

@@ -22,4 +22,3 @@ module.exports = {
         return 'starter';
     }),
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9zdGFydGVyL3N0YXJ0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFFQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxPQUFPLEdBQUc7SUFDZixLQUFLLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDYixXQUFXLEVBQUUsa0JBQWtCO0lBQy9CLE1BQU0sRUFBRSxJQUFJO0lBQ1osSUFBSSxFQUFFLFNBQVM7SUFDZixHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7UUFDN0MsTUFBTSxPQUFPLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUN6QyxPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDLENBQUE7Q0FDRixDQUFDIn0=