@webspatial/builder 1.0.0 → 1.0.2

package/dist/lib/cmds/build.js

@@ -56,17 +56,15 @@ async function run(args) {
       If it is the same, it will be defaulted as already compiled, and the compilation will be skipped and the application will be launched directly.
     */
     // fixme: the cache not invalidate when npm version change
-    // if (manifestInfo.fromNet || args['tryWithoutBuild'] === 'true') {
-    //   // If this command is a new command, go through the build process; otherwise, go through the launch process
-    //   if (
-    //     CliHistory.checkManifest(manifestInfo.json) &&
-    //     CliHistory.checkTestAppIsExist()
-    //   ) {
-    //     console.log('Same as the previous record')
-    //     await XcodeManager.runWithHistory()
-    //     return
-    //   }
-    // }
+    if (manifestInfo.fromNet || args['tryWithoutBuild'] === 'true') {
+        // If this command is a new command, go through the build process; otherwise, go through the launch process
+        if (history_1.default.checkManifest(manifestInfo.json) &&
+            history_1.default.checkTestAppIsExist()) {
+            console.log('Same as the previous record');
+            await xcode_1.XcodeManager.runWithHistory();
+            return;
+        }
+    }
     resource_1.ResourceManager.pullPlatformModule(args['platform']);
     const icon = await doReadyProject((_a = args['project']) !== null && _a !== void 0 ? _a : 'dist', manifestInfo);
     await doXcode(args, icon, manifestInfo, true);

package/dist/lib/pwa/config.js

@@ -140,34 +140,39 @@ function configDisplay(manifestJson) {
 }
 function configMainScene(manifestJson) {
     var _a, _b;
-    const resizabilities = ['automatic', 'contentMinSize', 'contentSize'];
+    const resizabilities = ['minWidth', 'minHeight', 'maxWidth', 'maxHeight'];
     let mainScene = {
         defaultSize: {
             width: 1280,
             height: 1280,
         },
-        resizability: 'nil',
+        resizability: {},
     };
-    if (manifestJson.xr_main_scene) {
-        if (typeof manifestJson.xr_main_scene === 'object') {
-            mainScene.defaultSize.width =
-                Number((_a = manifestJson.xr_main_scene.default_size) === null || _a === void 0 ? void 0 : _a.width) > 0
-                    ? manifestJson.xr_main_scene.default_size.width
-                    : 1280;
-            mainScene.defaultSize.height =
-                Number((_b = manifestJson.xr_main_scene.default_size) === null || _b === void 0 ? void 0 : _b.height) > 0
-                    ? manifestJson.xr_main_scene.default_size.height
-                    : 1280;
-            mainScene.resizability = resizabilities.includes(manifestJson.xr_main_scene.resizability)
-                ? manifestJson.xr_main_scene.resizability
-                : 'nil';
-            manifestJson.mainScene = mainScene;
-        }
-        else if (typeof manifestJson.xr_main_scene === 'string') {
-            manifestJson.mainScene = 'dynamic'; // only support this
+    let hasResizability = false;
+    if (manifestJson.xr_main_scene &&
+        typeof manifestJson.xr_main_scene === 'object') {
+        mainScene.defaultSize.width =
+            Number((_a = manifestJson.xr_main_scene.default_size) === null || _a === void 0 ? void 0 : _a.width) > 0
+                ? manifestJson.xr_main_scene.default_size.width
+                : 1280;
+        mainScene.defaultSize.height =
+            Number((_b = manifestJson.xr_main_scene.default_size) === null || _b === void 0 ? void 0 : _b.height) > 0
+                ? manifestJson.xr_main_scene.default_size.height
+                : 1280;
+        if (typeof manifestJson.xr_main_scene.resizability === 'object') {
+            for (var i = 0; i < resizabilities.length; i++) {
+                if (manifestJson.xr_main_scene.resizability[resizabilities[i]] >= 0) {
+                    hasResizability = true;
+                    mainScene.resizability[resizabilities[i]] =
+                        manifestJson.xr_main_scene.resizability[resizabilities[i]];
+                }
+            }
         }
-        // other type like string should be ignored
     }
+    if (!hasResizability) {
+        mainScene.resizability = null;
+    }
+    manifestJson.xr_main_scene = mainScene;
 }
 function configDeeplink(manifestJson) {
     if (manifestJson.protocol_handlers &&

package/dist/lib/pwa/index.js

@@ -68,12 +68,15 @@ class PWAGenerator {
         };
     }
     static compareManifest(manifest) {
-        var _a, _b, _c, _d;
-        manifest.name = (_a = manifest.name) !== null && _a !== void 0 ? _a : this.defaultManifestJson.name;
-        manifest.display = (_b = manifest.display) !== null && _b !== void 0 ? _b : this.defaultManifestJson.display;
+        var _a, _b, _c;
+        manifest.name =
+            manifest.name && manifest.name.length > 0
+                ? manifest.name
+                : this.defaultManifestJson.name;
+        manifest.display = (_a = manifest.display) !== null && _a !== void 0 ? _a : this.defaultManifestJson.display;
         manifest.start_url =
-            (_c = manifest.start_url) !== null && _c !== void 0 ? _c : this.defaultManifestJson.start_url;
-        manifest.scope = (_d = manifest.scope) !== null && _d !== void 0 ? _d : this.defaultManifestJson.scope;
+            (_b = manifest.start_url) !== null && _b !== void 0 ? _b : this.defaultManifestJson.start_url;
+        manifest.scope = (_c = manifest.scope) !== null && _c !== void 0 ? _c : this.defaultManifestJson.scope;
         return manifest;
     }
     // generate manifest

package/dist/lib/pwa/validate.js

@@ -15,7 +15,9 @@ const utils_2 = require("../utils/utils");
 function checkManifestJson(manifestJson, isDev = false) {
     var _a;
     const errors = [];
-    if (!manifestJson.name && !manifestJson['short_name'] && !isDev) {
+    if ((!manifestJson.name || manifestJson.name.length === 0) &&
+        !manifestJson['short_name'] &&
+        !isDev) {
         errors.push({
             code: 3006,
             message: 'In the Web Spatial App Manifest, it is necessary to provide the name property or short_name property (preferably both)',

package/dist/lib/utils/history.js

@@ -63,6 +63,9 @@ class CliHistory {
     }
     // Compare whether two objects are equal
     static compareObjects(obj1, obj2) {
+        if (obj1 === null || obj2 === null) {
+            return false;
+        }
         // 1. Check if the number of properties is the same
         const keys1 = Object.keys(obj1);
         const keys2 = Object.keys(obj2);

package/dist/lib/xcode/manifestSwiftTemplate.d.ts

@@ -1 +1 @@
-export declare const manifestSwiftTemplate = "\nimport Foundation\n\nvar pwaManager = PWAManager()\n\nstruct PWAManager: Codable {\n    var isLocal: Bool = false\n    var start_url: String = \"START_URL\"\n    var scope: String = \"SCOPE\"\n    var id: String = \"AppID\"\n\n    var name: String = \"AppName\"\n    var short_name: String = \"name\"\n    var description: String = \"Description\"\n\n    var display: PWADisplayMode = .minimal\n    var display_override: [PWADisplayMode] = []\n    var protocol_handlers: [PWAProtocol] = [PWAProtocol(protocolValue: \"\", url: \"\")]\n    var mainScene: WindowContainerOptions = .init(\n        defaultSize: .init(\n            width: SceneWidth,\n            height: SceneHeight\n        ),\n        resizability: SceneResizability\n    )\n    var useMainScene: Bool = USE_MAIN_SCENE\n    private var version: String = \"PACKAGE_VERSION\"\n\n    mutating func _init() {\n        let urlType = start_url.split(separator: \"://\").first\n        if !(urlType == \"http\" || urlType == \"https\") {\n            if scope == \"\" || scope == \"/\" {\n                scope = \"./\"\n            }\n            let startUrl = Bundle.main.url(forResource: start_url, withExtension: \"\", subdirectory: \"\")\n            start_url = startUrl!.absoluteString\n            scope = URL(string: (scope.starts(with: \"/\") ? \".\" : \"./\") + scope, relativeTo: Bundle.main.executableURL)!.absoluteString\n            isLocal = true\n        }\n\n        if display_override.count > 0 {\n            display = display_override[0]\n        }\n\n        for i in 0 ... protocol_handlers.count - 1 {\n            let item = protocol_handlers[i]\n            protocol_handlers[i].updateUrl(scope + item.url)\n        }\n    }\n\n    func checkInScope(url: String) -> Bool {\n        return url.starts(with: scope)\n    }\n\n    // web+spatial://test\n    func checkInDeeplink(url: String) -> String {\n        var linkUrl: String = url\n        for item in protocol_handlers {\n            if linkUrl.starts(with: item.protocolValue) {\n                let queryString: String = linkUrl.replacingOccurrences(of: item.protocolValue, with: \"\").addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!\n                linkUrl = item.url.replacingOccurrences(of: \"%s\", with: item.protocolValue + queryString)\n            }\n        }\n        logger.debug(linkUrl)\n        return linkUrl\n    }\n\n    func getLocalResourceURL(url: String) -> String {\n        let path = String(url.split(separator: \"file://\").first!.split(separator: \"?\").first!)\n        let newUrl = URL(string: url)\n        let fileManager = FileManager.default\n        if fileManager.fileExists(atPath: newUrl!.path) {\n            return url\n        }\n        var resource: String = Bundle.main.url(forResource: newUrl?.path, withExtension: \"\", subdirectory: \"\")?.absoluteString ?? \"\"\n        if resource == \"\" {\n            resource = Bundle.main.url(forResource: \"static-web\" + path, withExtension: \"\", subdirectory: \"\")?.absoluteString ?? \"\"\n        }\n        if resource == \"\" {\n            return url\n        }\n        if newUrl?.query() != nil {\n            resource += \"?\" + (newUrl?.query())!\n        }\n        if newUrl?.fragment() != nil {\n            resource += \"#\" + (newUrl?.fragment())!\n        }\n        return resource\n    }\n    \n    func getVersion() -> String {\n        return version\n    }\n}\n\nenum PWADisplayMode: Codable {\n    case minimal\n    case standalone\n    case fullscreen\n}\n\nstruct PWAProtocol: Codable {\n    var protocolValue: String = \"\"\n    var url: String = \"\"\n\n    mutating func updateUrl(_ str: String) {\n        url = str\n    }\n}\n\n";
+export declare const manifestSwiftTemplate = "\nimport Foundation\n\nvar pwaManager = PWAManager()\n\nstruct PWAManager: Codable {\n    var isLocal: Bool = false\n    var start_url: String = \"START_URL\"\n    var scope: String = \"SCOPE\"\n    var id: String = \"AppID\"\n\n    var name: String = \"AppName\"\n    var short_name: String = \"name\"\n    var description: String = \"Description\"\n\n    var display: PWADisplayMode = .minimal\n    var display_override: [PWADisplayMode] = []\n    var protocol_handlers: [PWAProtocol] = [PWAProtocol(protocolValue: \"\", url: \"\")]\n    var mainScene: WindowContainerOptions = .init(\n        defaultSize: .init(\n            width: SceneWidth,\n            height: SceneHeight\n        ),\n        resizability: SceneResizability\n    )\n    private var version: String = \"PACKAGE_VERSION\"\n\n    mutating func _init() {\n        let urlType = start_url.split(separator: \"://\").first\n        if !(urlType == \"http\" || urlType == \"https\") {\n            if scope == \"\" || scope == \"/\" {\n                scope = \"./\"\n            }\n            let startUrl = Bundle.main.url(forResource: start_url, withExtension: \"\", subdirectory: \"\")\n            start_url = startUrl!.absoluteString\n            scope = URL(string: (scope.starts(with: \"/\") ? \".\" : \"./\") + scope, relativeTo: Bundle.main.executableURL)!.absoluteString\n            isLocal = true\n        }\n\n        if display_override.count > 0 {\n            display = display_override[0]\n        }\n\n        for i in 0 ... protocol_handlers.count - 1 {\n            let item = protocol_handlers[i]\n            protocol_handlers[i].updateUrl(scope + item.url)\n        }\n    }\n\n    func checkInScope(url: String) -> Bool {\n        return url.starts(with: scope)\n    }\n\n    // web+spatial://test\n    func checkInDeeplink(url: String) -> String {\n        var linkUrl: String = url\n        for item in protocol_handlers {\n            if linkUrl.starts(with: item.protocolValue) {\n                let queryString: String = linkUrl.replacingOccurrences(of: item.protocolValue, with: \"\").addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!\n                linkUrl = item.url.replacingOccurrences(of: \"%s\", with: item.protocolValue + queryString)\n            }\n        }\n        logger.debug(linkUrl)\n        return linkUrl\n    }\n\n    func getLocalResourceURL(url: String) -> String {\n        let path = String(url.split(separator: \"file://\").first!.split(separator: \"?\").first!)\n        let newUrl = URL(string: url)\n        let fileManager = FileManager.default\n        if fileManager.fileExists(atPath: newUrl!.path) {\n            return url\n        }\n        var resource: String = Bundle.main.url(forResource: newUrl?.path, withExtension: \"\", subdirectory: \"\")?.absoluteString ?? \"\"\n        if resource == \"\" {\n            resource = Bundle.main.url(forResource: \"static-web\" + path, withExtension: \"\", subdirectory: \"\")?.absoluteString ?? \"\"\n        }\n        if resource == \"\" {\n            return url\n        }\n        if newUrl?.query() != nil {\n            resource += \"?\" + (newUrl?.query())!\n        }\n        if newUrl?.fragment() != nil {\n            resource += \"#\" + (newUrl?.fragment())!\n        }\n        return resource\n    }\n    \n    func getVersion() -> String {\n        return version\n    }\n}\n\nenum PWADisplayMode: Codable {\n    case minimal\n    case standalone\n    case fullscreen\n}\n\nstruct PWAProtocol: Codable {\n    var protocolValue: String = \"\"\n    var url: String = \"\"\n\n    mutating func updateUrl(_ str: String) {\n        url = str\n    }\n}\n\n";

package/dist/lib/xcode/manifestSwiftTemplate.js

@@ -26,7 +26,6 @@ struct PWAManager: Codable {
         ),
         resizability: SceneResizability
     )
-    var useMainScene: Bool = USE_MAIN_SCENE
     private var version: String = "PACKAGE_VERSION"
 
     mutating func _init() {

package/dist/lib/xcode/xcodeproject.js

@@ -231,20 +231,21 @@ class XcodeProject {
             }
             manifestSwift = manifestSwift.replace('PWAProtocol(protocolValue: "", url: "")', deeplinkString);
         }
-        if (typeof manifest.mainScene === 'object') {
-            manifestSwift = manifestSwift.replace('SceneWidth', manifest.mainScene.defaultSize.width);
-            manifestSwift = manifestSwift.replace('SceneHeight', manifest.mainScene.defaultSize.height);
-            manifestSwift = manifestSwift.replace('SceneResizability', `"${manifest.mainScene.resizability}"`);
-            manifestSwift = manifestSwift.replace('USE_MAIN_SCENE', 'true');
-        }
-        else {
-            // string or other type
-            // set these to bypass lint
-            manifestSwift = manifestSwift.replace('SceneWidth', '1280');
-            manifestSwift = manifestSwift.replace('SceneHeight', '1280');
-            manifestSwift = manifestSwift.replace('SceneResizability', `nil`);
-            manifestSwift = manifestSwift.replace('USE_MAIN_SCENE', 'false');
+        manifestSwift = manifestSwift.replace('SceneWidth', manifest.xr_main_scene.defaultSize.width);
+        manifestSwift = manifestSwift.replace('SceneHeight', manifest.xr_main_scene.defaultSize.height);
+        let res = 'nil';
+        const resizabilities = ['minWidth', 'minHeight', 'maxWidth', 'maxHeight'];
+        if (manifest.xr_main_scene.resizability) {
+            res = 'ResizeRange(';
+            for (var i = 0; i < resizabilities.length; i++) {
+                if (manifest.xr_main_scene.resizability[resizabilities[i]] >= 0) {
+                    res += `${resizabilities[i]}: ${manifest.xr_main_scene.resizability[resizabilities[i]]},`;
+                }
+            }
+            res = res.substring(0, res.length - 1);
+            res += ')';
         }
+        manifestSwift = manifestSwift.replace('SceneResizability', res);
         fs.writeFileSync(manifestSwiftPath, manifestSwift, 'utf-8');
     }
 }

package/dist/lib/xcode/xcrun.d.ts

@@ -30,6 +30,7 @@ export default class Xcrun {
     static shutdownSimulator(): Promise<void>;
     private static launchSimulator;
     private static buildTestApp;
+    private static terminateApp;
     private static installApp;
     private static launchApp;
     private static parseDestinationDevices;

package/dist/lib/xcode/xcrun.js

@@ -110,6 +110,10 @@ class Xcrun {
         console.log(`use simulator: ${device.deviceId}`);
         // launch visionOS simulator
         this.launchSimulator(device);
+        try {
+            this.terminateApp(device.deviceId, appInfo.id);
+        }
+        catch (_a) { }
         // install app
         console.log('installing app');
         this.installApp(resource_1.PROJECT_TEST_DIRECTORY, device.deviceId, appInfo.name);
@@ -169,6 +173,9 @@ class Xcrun {
         console.log('------------------- build end -------------------');
         return true;
     }
+    static terminateApp(deviceId, appId) {
+        (0, child_process_1.execSync)(new XcrunCMD().simctl().terminate(deviceId, appId).line);
+    }
     static installApp(path, deviceId, appName) {
         const appFile = (0, path_1.join)(path, `Build/Products/Debug-xrsimulator/${appName}.app`);
         let cmd = new XcrunCMD().simctl();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webspatial/builder",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Client CLI tool to Generate XRApp project for Apple Vision Pro",
   "type": "commonjs",
   "engines": {
@@ -40,7 +40,7 @@
     "sharp": "^0.33.5",
     "valid-url": "^1.0.9",
     "xcode": "^3.0.1",
-    "@webspatial/platform-visionos": "^1.0.0"
+    "@webspatial/platform-visionos": "^1.0.2"
   },
   "devDependencies": {
     "@rollup/plugin-terser": "^0.4.3",