@lakutata/cli 3.1.5 → 3.1.6

package/dist/esm/controllers/NwjsController.js

@@ -70,7 +70,7 @@ export class NwjsController extends Controller {
         done(`NW.js ${release.version}: Node.js ${release.node}, Chromium ${release.chromium}`);
         step(`Runs on ${systemsOf(release)}`);
         if (input.download) {
-            const runtime = await downloadNwjs({ version: release.version, flavor: 'sdk' });
+            const runtime = await downloadNwjs({ version: release.version, flavor: 'sdk', progress: (line) => step(`Downloading ${line}`) });
             done(`Downloaded NW.js ${runtime.version} (sdk, ${runtime.platform})`);
         }
         return undefined;
@@ -82,7 +82,7 @@ export class NwjsController extends Controller {
             step(`Native addons built for NW.js ${stage.release.version} (${stage.platform}): ${stage.addons.rebuilt.join(', ')}`);
         if (stage.addons.renamed.length)
             step(`Native addons loading the Node.js of NW.js (node.dll): ${stage.addons.renamed.join(', ')}`);
-        const runtime = await downloadNwjs({ version: stage.release.version, flavor: input.flavor });
+        const runtime = await downloadNwjs({ version: stage.release.version, flavor: input.flavor, progress: (line) => step(`Downloading ${line}`) });
         step(`NW.js ${runtime.version} (${runtime.flavor}, ${runtime.platform}): Node.js ${runtime.node}, Chromium ${runtime.chromium.split('.')[0]}`);
         const code = await new Promise((resolve, reject) => {
             const child = spawn(runtime.executable, [stage.directory, ...input.args ?? []], { stdio: 'inherit' });

package/dist/esm/controllers/PackController.js

@@ -68,7 +68,7 @@ export class PackController extends Controller {
     }
     async installer(input) {
         const { buildInstaller } = await loadBuilder(process.cwd());
-        const result = await buildInstaller({ project: process.cwd(), targets: input.target, outdir: input.outdir, entry: input.entry, minify: input.minify, external: input.external, nodeProgram: input.nodeProgram, arch: input.arch });
+        const result = await buildInstaller({ project: process.cwd(), targets: input.target, outdir: input.outdir, entry: input.entry, minify: input.minify, external: input.external, nodeProgram: input.nodeProgram, arch: input.arch, progress: (line) => step(`Downloading ${line}`) });
         if (result.nwjs) {
             step(`NW.js ${result.nwjs.runtime.version} (${result.nwjs.runtime.platform}): ${path.basename(result.nwjs.directory)}`);
             if (result.nwjs.stage.addons.rebuilt.length)

package/dist/esm/dtos/CreateProjectDTO.js

@@ -19,6 +19,10 @@ __decorate([
     Expect(DTO.String().optional().pattern(/^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/).description('The ID of the application (a package name), its name in lower case by default')),
     __metadata("design:type", String)
 ], CreateProjectDTO.prototype, "id", void 0);
+__decorate([
+    Expect(DTO.String().optional().pattern(/^[a-zA-Z][a-zA-Z0-9_]*(\.[a-zA-Z][a-zA-Z0-9_]*)+$/).description('The id of the application on the mobile systems (reverse domain name: com.acme.shop), for the mobile templates: com.example.<name> by default, which the stores refuse')),
+    __metadata("design:type", String)
+], CreateProjectDTO.prototype, "bundleId", void 0);
 __decorate([
     Expect(DTO.String().optional().default('default').description('The template: the name of an official template (lakutata templates lists them), npm:<package>, github:<owner>/<repo> or a directory')),
     __metadata("design:type", String)

package/dist/esm/dtos/MobileDeployDTO.js

@@ -0,0 +1,25 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { DTO } from 'lakutata';
+import { Expect } from 'lakutata/decorator/dto';
+export class MobileDeployDTO extends DTO {
+}
+__decorate([
+    Expect(DTO.String().valid('android', 'ios', 'harmony').required().description('The system: android (an emulator or a device, the debug build of the application), ios (a simulator) or harmony (an emulator or a device, the debug build of the application)')),
+    __metadata("design:type", String)
+], MobileDeployDTO.prototype, "platform", void 0);
+__decorate([
+    Expect(DTO.String().optional().description('The emulator or the device of Android (its serial, adb devices) or of HarmonyOS (its target, hdc list targets), the simulator of iOS (its UDID or its name, xcrun simctl list); the one running by default')),
+    __metadata("design:type", String)
+], MobileDeployDTO.prototype, "device", void 0);
+__decorate([
+    Expect(DTO.Boolean().optional().default(false).description('Watch the files of the application: when they change, run its build script (npm run build) and deploy it again, until Ctrl+C')),
+    __metadata("design:type", Boolean)
+], MobileDeployDTO.prototype, "watch", void 0);

package/dist/esm/dtos/MobileNodeDTO.js

@@ -0,0 +1,21 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { DTO } from 'lakutata';
+import { Expect } from 'lakutata/decorator/dto';
+export class MobileNodeDTO extends DTO {
+}
+__decorate([
+    Expect(DTO.String().valid('android', 'ios', 'harmony').required().description('The system the libnode is downloaded for: android, ios or harmony')),
+    __metadata("design:type", String)
+], MobileNodeDTO.prototype, "platform", void 0);
+__decorate([
+    Expect(DTO.String().optional().description('The architectures of Android downloaded for, separated by commas (arm64-v8a,armeabi-v7a,x86_64); arm64-v8a,x86_64 by default')),
+    __metadata("design:type", String)
+], MobileNodeDTO.prototype, "abis", void 0);

package/dist/esm/dtos/MobileRunDTO.js

@@ -0,0 +1,21 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { DTO } from 'lakutata';
+import { Expect } from 'lakutata/decorator/dto';
+export class MobileRunDTO extends DTO {
+}
+__decorate([
+    Expect(DTO.String().valid('android', 'ios', 'harmony').required().description('The system: android (an emulator or a device), ios (a simulator) or harmony (an emulator or a device)')),
+    __metadata("design:type", String)
+], MobileRunDTO.prototype, "platform", void 0);
+__decorate([
+    Expect(DTO.String().optional().description('The emulator or the device of Android (its serial, adb devices) or of HarmonyOS (its target, hdc list targets), the simulator of iOS (its UDID or its name, xcrun simctl list devices); the one running by default, else the newest iPhone for iOS')),
+    __metadata("design:type", String)
+], MobileRunDTO.prototype, "device", void 0);

package/dist/esm/dtos/MobileStageDTO.js

@@ -0,0 +1,25 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { DTO } from 'lakutata';
+import { Expect } from 'lakutata/decorator/dto';
+export class MobileStageDTO extends DTO {
+}
+__decorate([
+    Expect(DTO.String().valid('android', 'ios', 'harmony').required().description('The system the Node.js project is made for: android, ios or harmony')),
+    __metadata("design:type", String)
+], MobileStageDTO.prototype, "platform", void 0);
+__decorate([
+    Expect(DTO.Boolean().optional().default(true).description('Minify the bundle (true by default)')),
+    __metadata("design:type", Boolean)
+], MobileStageDTO.prototype, "minify", void 0);
+__decorate([
+    Expect(DTO.String().optional().description('The architectures of Android the native addons are built for, separated by commas (arm64-v8a,x86_64); those of the libnode by default')),
+    __metadata("design:type", String)
+], MobileStageDTO.prototype, "abis", void 0);

package/dist/esm/lib/ProjectCreator.js

@@ -119,6 +119,23 @@ let ProjectCreator = class ProjectCreator extends Component {
                 await writeFile(target, filled);
         }
     }
+    /**
+     * Whether a template (its files, those of its features) holds a field ({$APP_BUNDLE_ID}…)
+     * @param template
+     * @param field
+     */
+    async uses(template, field) {
+        for (const root of [template.root, template.featuresDirectory]) {
+            if (!root || !existsSync(root))
+                continue;
+            for (const file of await listFiles(root)) {
+                const content = await readFile(path.join(root, file));
+                if (isText(content) && content.toString('utf8').includes(field))
+                    return true;
+            }
+        }
+        return false;
+    }
     /**
      * Get the files of a template
      * @param source
@@ -151,6 +168,7 @@ let ProjectCreator = class ProjectCreator extends Component {
         await this.fill(plan.directory, files, {
             $APP_NAME: plan.name,
             $APP_ID: plan.id,
+            $APP_BUNDLE_ID: plan.bundleId,
             $APP_DESC: plan.description,
             $APP_AUTHOR: plan.author,
             $APP_LICENSE: plan.license,

package/dist/esm/lib/TemplateCatalog.js

@@ -34,7 +34,8 @@ export const BUILTIN_TEMPLATES = [
     { name: 'electron-react', description: 'A desktop application: Electron, its main process serving a React renderer over IPC', package: '@lakutata/template-electron-react', features: ['i18n'] },
     { name: 'electron-vue', description: 'A desktop application: Electron, its main process serving a Vue renderer over IPC', package: '@lakutata/template-electron-vue', features: ['i18n'] },
     { name: 'nwjs-react', description: 'A desktop application: NW.js, its background script serving a React user interface isolated in a webview', package: '@lakutata/template-nwjs-react', features: ['i18n', 'win7'] },
-    { name: 'nwjs-vue', description: 'A desktop application: NW.js, its background script serving a Vue user interface isolated in a webview', package: '@lakutata/template-nwjs-vue', features: ['i18n', 'win7'] }
+    { name: 'nwjs-vue', description: 'A desktop application: NW.js, its background script serving a Vue user interface isolated in a webview', package: '@lakutata/template-nwjs-vue', features: ['i18n', 'win7'] },
+    { name: 'mobile-react', description: 'A mobile application (Android, iOS, HarmonyOS): React Native, the Node.js of the application serving its user interface', package: '@lakutata/template-mobile-react', features: ['i18n'] }
 ];
 /**
  * How long the catalog is kept, 1 day

package/dist/esm/locales/zh-CN.json

@@ -7,6 +7,7 @@
                 "options": {
                     "name": "应用的名称",
                     "id": "应用的 ID（包名），默认是名称的小写形式",
+                    "bundleId": "应用在手机系统上的标识（反向域名：com.acme.shop），用于手机模板：默认是 com.example.<名称>，应用商店不接受",
                     "template": "模板：官方模板的名称（lakutata templates 会列出）、npm:<包名>、github:<所有者>/<仓库> 或一个目录",
                     "path": "在哪个目录下创建项目目录",
                     "init": "直接在该目录中创建项目，目录可以已存在且非空",
@@ -184,6 +185,47 @@
                     }
                 }
             },
+            "mobile": {
+                "description": "React Native 手机应用（Android、iOS、鸿蒙）：下载它的 libnode，生成它的 Node.js 项目，在模拟器上运行应用，开发时部署到已安装的应用里",
+                "node": {
+                    "description": "从 lakutata/libnode 的 Release 下载一个系统（android、ios、harmony）的 libnode（LAKUTATA_LIBNODE_MIRROR 指定镜像），只下载一次：保存在 lakutata 的缓存中，放到 packages/ipc/native/node/out/<platform>",
+                    "arguments": {
+                        "platform": "libnode 面向的系统：android、ios 或 harmony"
+                    },
+                    "options": {
+                        "abis": "Android 的架构，用逗号分隔（arm64-v8a,armeabi-v7a,x86_64）；默认是 arm64-v8a,x86_64"
+                    }
+                },
+                "stage": {
+                    "description": "为一个系统（android、ios、harmony）生成手机应用（packages/app）的 Node.js 项目，放到系统的原生工程读取它的位置，并用这个系统的 libnode 编译原生插件",
+                    "arguments": {
+                        "platform": "Node.js 项目面向的系统：android、ios 或 harmony"
+                    },
+                    "options": {
+                        "minify": "压缩单文件包（默认为 true）",
+                        "abis": "为哪些 Android 架构编译原生插件，用逗号分隔（arm64-v8a,x86_64）；默认是 libnode 的那些架构"
+                    }
+                },
+                "run": {
+                    "description": "用原生工程构建一个系统（android、ios、harmony）的调试版应用，安装到模拟器或设备上并启动，界面由 Metro（npm start）提供",
+                    "arguments": {
+                        "platform": "系统：android（模拟器或设备）、ios（模拟器）或 harmony（模拟器或设备）"
+                    },
+                    "options": {
+                        "device": "Android 的模拟器或设备（序列号，见 adb devices）、鸿蒙的模拟器或设备（见 hdc list targets）、iOS 的模拟器（UDID 或名称，见 xcrun simctl list devices）；默认是正在运行的那个，iOS 没有时用最新的 iPhone"
+                    }
+                },
+                "deploy": {
+                    "description": "生成手机应用的 Node.js 项目，放进一个系统（android、ios、harmony）的模拟器或设备上已安装的调试版应用，再重新启动应用（开发时不用重新安装）",
+                    "arguments": {
+                        "platform": "系统：android（模拟器或设备，应用的调试版）、ios（模拟器）或 harmony（模拟器或设备，应用的调试版）"
+                    },
+                    "options": {
+                        "device": "Android 的模拟器或设备（序列号，见 adb devices）、鸿蒙的模拟器或设备（见 hdc list targets）、iOS 的模拟器（UDID 或名称，见 xcrun simctl list）；默认是正在运行的那个",
+                        "watch": "监视应用的文件：有变化就执行它的 build 脚本（npm run build）并重新部署，直到按 Ctrl+C"
+                    }
+                }
+            },
             "i18n": {
                 "description": "检查各语言的翻译、声明键名的类型，或添加一种语言",
                 "arguments": {
@@ -227,6 +269,7 @@
             "title": "项目",
             "name": "名称",
             "id": "ID",
+            "bundleId": "应用标识（Bundle ID）",
             "description": "描述",
             "author": "作者",
             "license": "许可证",

package/dist/esm/locales/zh-TW.json

@@ -7,6 +7,7 @@
                 "options": {
                     "name": "應用程式的名稱",
                     "id": "應用程式的 ID（套件名稱），預設為名稱的小寫形式",
+                    "bundleId": "應用程式在手機系統上的識別碼（反向網域名稱：com.acme.shop），用於手機範本：預設是 com.example.<名稱>，應用程式商店不接受",
                     "template": "範本：官方範本的名稱（lakutata templates 會列出）、npm:<套件名稱>、github:<擁有者>/<儲存庫> 或一個目錄",
                     "path": "在哪個目錄下建立專案目錄",
                     "init": "直接在該目錄中建立專案，目錄可以已存在且非空",
@@ -184,6 +185,47 @@
                     }
                 }
             },
+            "mobile": {
+                "description": "React Native 手機應用程式（Android、iOS、鴻蒙）：下載它的 libnode，產生它的 Node.js 專案，在模擬器上執行應用程式，開發時部署到已安裝的應用程式裡",
+                "node": {
+                    "description": "從 lakutata/libnode 的 Release 下載一個系統（android、ios、harmony）的 libnode（LAKUTATA_LIBNODE_MIRROR 指定鏡像），只下載一次：保存在 lakutata 的快取中，放到 packages/ipc/native/node/out/<platform>",
+                    "arguments": {
+                        "platform": "libnode 對應的系統：android、ios 或 harmony"
+                    },
+                    "options": {
+                        "abis": "Android 的架構，以逗號分隔（arm64-v8a,armeabi-v7a,x86_64）；預設是 arm64-v8a,x86_64"
+                    }
+                },
+                "stage": {
+                    "description": "為一個系統（android、ios、harmony）產生手機應用程式（packages/app）的 Node.js 專案，放到系統的原生專案讀取它的位置，並用這個系統的 libnode 編譯原生外掛",
+                    "arguments": {
+                        "platform": "Node.js 專案對應的系統：android、ios 或 harmony"
+                    },
+                    "options": {
+                        "minify": "壓縮單一檔案包（預設為 true）",
+                        "abis": "為哪些 Android 架構編譯原生外掛，以逗號分隔（arm64-v8a,x86_64）；預設是 libnode 的那些架構"
+                    }
+                },
+                "run": {
+                    "description": "用原生專案建置一個系統（android、ios、harmony）的除錯版應用程式，安裝到模擬器或裝置上並啟動，介面由 Metro（npm start）提供",
+                    "arguments": {
+                        "platform": "系統：android（模擬器或裝置）、ios（模擬器）或 harmony（模擬器或裝置）"
+                    },
+                    "options": {
+                        "device": "Android 的模擬器或裝置（序號，見 adb devices）、鴻蒙的模擬器或裝置（見 hdc list targets）、iOS 的模擬器（UDID 或名稱，見 xcrun simctl list devices）；預設是正在執行的那個，iOS 沒有時用最新的 iPhone"
+                    }
+                },
+                "deploy": {
+                    "description": "產生手機應用程式的 Node.js 專案，放進一個系統（android、ios、harmony）的模擬器或裝置上已安裝的除錯版應用程式，再重新啟動應用程式（開發時不用重新安裝）",
+                    "arguments": {
+                        "platform": "系統：android（模擬器或裝置，應用程式的除錯版）、ios（模擬器）或 harmony（模擬器或裝置，應用程式的除錯版）"
+                    },
+                    "options": {
+                        "device": "Android 的模擬器或裝置（序號，見 adb devices）、鴻蒙的模擬器或裝置（見 hdc list targets）、iOS 的模擬器（UDID 或名稱，見 xcrun simctl list）；預設是正在執行的那個",
+                        "watch": "監看應用程式的檔案：有變更就執行它的 build 腳本（npm run build）並重新部署，直到按下 Ctrl+C"
+                    }
+                }
+            },
             "i18n": {
                 "description": "檢查各語言的翻譯、宣告鍵名的型別，或新增一種語言",
                 "arguments": {
@@ -227,6 +269,7 @@
             "title": "專案",
             "name": "名稱",
             "id": "ID",
+            "bundleId": "應用程式識別碼（Bundle ID）",
             "description": "描述",
             "author": "作者",
             "license": "授權條款",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lakutata/cli",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "The command line tool of the lakutata framework: create the projects from the templates, run and version the packages of the workspaces, bundle the applications and make their executables (with @lakutata/builder).",
   "keywords": [
     "lakutata",
@@ -39,11 +39,11 @@
   "dependencies": {
     "@inquirer/prompts": "^7.10.1",
     "commander": "^13.1.0",
-    "lakutata": "3.1.5"
+    "lakutata": "3.1.6"
   },
   "peerDependencies": {
-    "@lakutata/builder": "~3.1.5",
-    "@lakutata/ffi": "~3.1.5"
+    "@lakutata/builder": "~3.1.6",
+    "@lakutata/ffi": "~3.1.6"
   },
   "peerDependenciesMeta": {
     "@lakutata/builder": {
@@ -54,8 +54,8 @@
     }
   },
   "devDependencies": {
-    "@lakutata/builder": "~3.1.5",
-    "@lakutata/ffi": "~3.1.5"
+    "@lakutata/builder": "~3.1.6",
+    "@lakutata/ffi": "~3.1.6"
   },
   "engines": {
     "node": ">=18.10.0"