@webspatial/builder 1.0.4 → 1.0.5

package/dist/lib/pwa/config.js

@@ -7,6 +7,7 @@ exports.configScope = configScope;
 exports.configDisplay = configDisplay;
 exports.configMainScene = configMainScene;
 exports.configDeeplink = configDeeplink;
+const sceneUtils_1 = require("../utils/sceneUtils");
 const utils_1 = require("../utils/utils");
 const validate_1 = require("./validate");
 const path_1 = require("path");
@@ -139,38 +140,74 @@ function configDisplay(manifestJson) {
     manifestJson.display = display;
 }
 function configMainScene(manifestJson) {
-    var _a, _b;
-    const resizabilities = ['minWidth', 'minHeight', 'maxWidth', 'maxHeight'];
+    var _a, _b, _c, _d, _e, _f;
     let mainScene = {
-        defaultSize: {
-            width: 1280,
-            height: 1280,
-        },
+        ...sceneUtils_1.defaultSceneConfig,
         resizability: {},
+        type: 'window',
+        worldScaling: 'automatic',
+        worldAlignment: 'automatic',
+        baseplateVisibility: 'automatic',
     };
+    // set type
+    if (((_a = manifestJson.xr_main_scene) === null || _a === void 0 ? void 0 : _a.type) == 'volume') {
+        mainScene.type = 'volume';
+    }
+    // set default value by type
+    if (mainScene.type == 'volume') {
+        mainScene = {
+            ...mainScene,
+            ...sceneUtils_1.defaultSceneConfigVolume,
+        };
+    }
     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;
+        let defaultSizeKeys = ['width', 'height', 'depth'];
+        for (let k of defaultSizeKeys) {
+            if ((0, sceneUtils_1.isValidSceneUnit)((_b = manifestJson.xr_main_scene.default_size) === null || _b === void 0 ? void 0 : _b[k])) {
+                ;
+                mainScene.defaultSize[k] = (0, sceneUtils_1.formatToNumber)((_c = manifestJson.xr_main_scene.default_size) === null || _c === void 0 ? void 0 : _c[k], mainScene.type === 'window' ? 'px' : 'm', mainScene.type === 'window' ? 'px' : 'm');
+            }
+            else {
+                console.warn('invalid defaultSize type');
+            }
+        }
         if (typeof manifestJson.xr_main_scene.resizability === 'object') {
+            const resizabilities = ['minWidth', 'minHeight', 'maxWidth', 'maxHeight'];
             for (var i = 0; i < resizabilities.length; i++) {
-                if (manifestJson.xr_main_scene.resizability[resizabilities[i]] >= 0) {
+                if ((0, sceneUtils_1.isValidSceneUnit)(manifestJson.xr_main_scene.resizability[resizabilities[i]])) {
                     hasResizability = true;
-                    mainScene.resizability[resizabilities[i]] =
-                        manifestJson.xr_main_scene.resizability[resizabilities[i]];
+                    //@ts-ignore
+                    mainScene.resizability[resizabilities[i]] = (0, sceneUtils_1.formatToNumber)(manifestJson.xr_main_scene.resizability[resizabilities[i]], 'px', mainScene.type === 'window' ? 'px' : 'm');
+                }
+                else {
+                    console.warn('invalid resizability type');
                 }
             }
         }
     }
     if (!hasResizability) {
-        mainScene.resizability = null;
+        mainScene.resizability = undefined;
+    }
+    if ((0, sceneUtils_1.isValidWorldScalingType)((_d = manifestJson.xr_main_scene) === null || _d === void 0 ? void 0 : _d.worldScaling)) {
+        mainScene.worldScaling = manifestJson.xr_main_scene.worldScaling;
+    }
+    else {
+        console.warn('invalid worldScaling type');
+    }
+    if ((0, sceneUtils_1.isValidWorldAlignmentType)((_e = manifestJson.xr_main_scene) === null || _e === void 0 ? void 0 : _e.worldAlignment)) {
+        mainScene.worldAlignment = manifestJson.xr_main_scene.worldAlignment;
+    }
+    else {
+        console.warn('invalid worldAlignment type');
+    }
+    if ((0, sceneUtils_1.isValidBaseplateVisibilityType)((_f = manifestJson.xr_main_scene) === null || _f === void 0 ? void 0 : _f.baseplateVisibility)) {
+        mainScene.baseplateVisibility =
+            manifestJson.xr_main_scene.baseplateVisibility;
+    }
+    else {
+        console.warn('invalid baseplateVisibility type');
     }
     manifestJson.xr_main_scene = mainScene;
 }

package/dist/lib/utils/sceneUtils.d.ts

@@ -0,0 +1,40 @@
+export interface SpatialSceneCreationOptions {
+    defaultSize?: {
+        width: number | string;
+        height: number | string;
+        depth?: number | string;
+    };
+    resizability?: {
+        minWidth?: number | string;
+        minHeight?: number | string;
+        maxWidth?: number | string;
+        maxHeight?: number | string;
+    };
+    worldScaling?: WorldScalingType;
+    worldAlignment?: WorldAlignmentType;
+    baseplateVisibility?: BaseplateVisibilityType;
+}
+export declare const BaseplateVisibilityValues: readonly ["automatic", "visible", "hidden"];
+export type BaseplateVisibilityType = (typeof BaseplateVisibilityValues)[number];
+export declare function isValidBaseplateVisibilityType(type: string): Boolean;
+export declare const WorldScalingValues: readonly ["automatic", "dynamic"];
+export type WorldScalingType = (typeof WorldScalingValues)[number];
+export declare function isValidWorldScalingType(type: string): Boolean;
+export declare const WorldAlignmentValues: readonly ["adaptive", "automatic", "gravityAligned"];
+export type WorldAlignmentType = (typeof WorldAlignmentValues)[number];
+export declare function isValidWorldAlignmentType(type: string): Boolean;
+export declare const SpatialSceneValues: readonly ["window", "volume"];
+export type SpatialSceneType = (typeof SpatialSceneValues)[number];
+export declare function isValidSpatialSceneType(type: string): Boolean;
+export type SpatialSceneCreationOptionsInternal = SpatialSceneCreationOptions & {
+    type: SpatialSceneType;
+};
+export declare function formatToNumber(str: string | number, targetUnit: 'px' | 'm', defaultUnit: 'px' | 'm'): number;
+export declare function formatSceneConfig(config: SpatialSceneCreationOptions, sceneType: SpatialSceneType): SpatialSceneCreationOptions;
+/**
+ * check px,m and number, number must be >= 0
+ *
+ * */
+export declare function isValidSceneUnit(val: string | number): boolean;
+export declare const defaultSceneConfig: SpatialSceneCreationOptions;
+export declare const defaultSceneConfigVolume: SpatialSceneCreationOptions;

package/dist/lib/utils/sceneUtils.js

@@ -0,0 +1,158 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultSceneConfigVolume = exports.defaultSceneConfig = exports.SpatialSceneValues = exports.WorldAlignmentValues = exports.WorldScalingValues = exports.BaseplateVisibilityValues = void 0;
+exports.isValidBaseplateVisibilityType = isValidBaseplateVisibilityType;
+exports.isValidWorldScalingType = isValidWorldScalingType;
+exports.isValidWorldAlignmentType = isValidWorldAlignmentType;
+exports.isValidSpatialSceneType = isValidSpatialSceneType;
+exports.formatToNumber = formatToNumber;
+exports.formatSceneConfig = formatSceneConfig;
+exports.isValidSceneUnit = isValidSceneUnit;
+exports.BaseplateVisibilityValues = [
+    'automatic',
+    'visible',
+    'hidden',
+];
+function isValidBaseplateVisibilityType(type) {
+    return exports.BaseplateVisibilityValues.includes(type);
+}
+exports.WorldScalingValues = ['automatic', 'dynamic'];
+function isValidWorldScalingType(type) {
+    return exports.WorldScalingValues.includes(type);
+}
+exports.WorldAlignmentValues = [
+    'adaptive',
+    'automatic',
+    'gravityAligned',
+];
+function isValidWorldAlignmentType(type) {
+    return exports.WorldAlignmentValues.includes(type);
+}
+exports.SpatialSceneValues = ['window', 'volume'];
+function isValidSpatialSceneType(type) {
+    return exports.SpatialSceneValues.includes(type);
+}
+function pxToMeter(px) {
+    return px / 1360;
+}
+function meterToPx(meter) {
+    return meter * 1360;
+}
+function formatToNumber(str, targetUnit, defaultUnit) {
+    if (typeof str === 'number') {
+        if ((defaultUnit === 'px' && targetUnit === 'px') ||
+            (defaultUnit === 'm' && targetUnit === 'm')) {
+            return str;
+        }
+        // unit not match target
+        if (defaultUnit === 'px' && targetUnit === 'm') {
+            return pxToMeter(str);
+        }
+        else if (defaultUnit === 'm' && targetUnit === 'px') {
+            return meterToPx(str);
+        }
+        // fallback
+        return str;
+    }
+    if (targetUnit === 'm') {
+        if (str.endsWith('m')) {
+            // 1m
+            return Number(str.slice(0, -1));
+        }
+        else if (str.endsWith('px')) {
+            // 100px
+            return pxToMeter(Number(str.slice(0, -2)));
+        }
+        else {
+            throw new Error('formatToNumber: invalid str');
+        }
+    }
+    else if (targetUnit === 'px') {
+        if (str.endsWith('px')) {
+            // 100px
+            return Number(str.slice(0, -2));
+        }
+        else if (str.endsWith('m')) {
+            // 1m
+            return meterToPx(Number(str.slice(0, -1)));
+        }
+        else {
+            throw new Error('formatToNumber: invalid str');
+        }
+    }
+    else {
+        throw new Error('formatToNumber: invalid targetUnit');
+    }
+}
+function formatSceneConfig(config, sceneType) {
+    // defaultSize and resizability's width/height/depth can be 100 or "100px" or "1m"
+    // expect:
+    // resizability should format into px
+    // defaultSize should format into px if window
+    // defaultSize should format into m if volume
+    const isWindow = sceneType === 'window';
+    // const isVolume = sceneType === 'volume'
+    // format resizability
+    if (config.resizability) {
+        const iterKeys = Object.keys(config.resizability);
+        for (let k of iterKeys) {
+            if (config.resizability[k]) {
+                ;
+                config.resizability[k] = formatToNumber(config.resizability[k], 'px', isWindow ? 'px' : 'm');
+            }
+        }
+    }
+    // format defaultSize
+    if (config.defaultSize) {
+        const iterKeys = Object.keys(config.defaultSize);
+        for (let k of iterKeys) {
+            if (config.defaultSize[k]) {
+                ;
+                config.defaultSize[k] = formatToNumber(config.defaultSize[k], isWindow ? 'px' : 'm', isWindow ? 'px' : 'm');
+            }
+        }
+    }
+    return config;
+}
+/**
+ * check px,m and number, number must be >= 0
+ *
+ * */
+function isValidSceneUnit(val) {
+    // only support number or string with unit px or m
+    // rpx cm mm not allowed
+    if (typeof val === 'number') {
+        return val >= 0;
+    }
+    if (typeof val === 'string') {
+        if (val.endsWith('px')) {
+            // check if number
+            if (isNaN(Number(val.slice(0, -2)))) {
+                return false;
+            }
+            return Number(val.slice(0, -2)) >= 0;
+        }
+        if (val.endsWith('m')) {
+            // check if number
+            if (isNaN(Number(val.slice(0, -1)))) {
+                return false;
+            }
+            return Number(val.slice(0, -1)) >= 0;
+        }
+    }
+    return false;
+}
+exports.defaultSceneConfig = {
+    defaultSize: {
+        width: 1280,
+        height: 720,
+        depth: 0,
+    },
+};
+exports.defaultSceneConfigVolume = {
+    defaultSize: {
+        width: 0.94,
+        height: 0.94,
+        depth: 0.94,
+    },
+};

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    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: XSceneOptionsJSB = .init(\n        defaultSize: .init(\n            width: SceneWidth,\n            height: SceneHeight,\n            depth: SceneDepth\n        ),\n        type: .SceneType,\n        resizability: SceneResizability,\n        worldScaling: .WorldScaling,\n        worldAlignment: .WorldAlignment,\n        baseplateVisibility: .BaseplateVisibility\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

@@ -19,12 +19,17 @@ struct PWAManager: Codable {
     var display: PWADisplayMode = .minimal
     var display_override: [PWADisplayMode] = []
     var protocol_handlers: [PWAProtocol] = [PWAProtocol(protocolValue: "", url: "")]
-    var mainScene: WindowContainerOptions = .init(
+    var mainScene: XSceneOptionsJSB = .init(
         defaultSize: .init(
             width: SceneWidth,
-            height: SceneHeight
+            height: SceneHeight,
+            depth: SceneDepth
         ),
-        resizability: SceneResizability
+        type: .SceneType,
+        resizability: SceneResizability,
+        worldScaling: .WorldScaling,
+        worldAlignment: .WorldAlignment,
+        baseplateVisibility: .BaseplateVisibility
     )
     private var version: String = "PACKAGE_VERSION"
 

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

@@ -6,6 +6,8 @@ export default class XcodeProject {
     private static updateExportOptions;
     private static bindManifestInfo;
     private static updateVersion;
+    private static writeInfoPlist;
+    private static updateSceneType;
     private static updateDeeplink;
     private static modifySwift;
 }

package/dist/lib/xcode/xcodeproject.js

@@ -50,7 +50,7 @@ const infoPlistXML = `<?xml version="1.0" encoding="UTF-8"?>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationPreferredDefaultSceneSessionRole</key>
-		<string>UIWindowSceneSessionRoleApplication</string>
+		<string>SCENE_SESSION_ROLE</string>
 		<key>UIApplicationSupportsMultipleScenes</key>
 		<true/>
 		<key>UISceneConfigurations</key>
@@ -190,30 +190,44 @@ class XcodeProject {
         fs.writeFileSync((0, path_1.join)(resource_1.PROJECT_BUILD_DIRECTORY, 'ExportOptions.plist'), useExportOptionsXML);
     }
     static async bindManifestInfo(xcodeProject, manifest, isDev = false) {
-        var _a;
+        var _a, _b;
         xcodeProject.updateProductName(manifest.name);
         // set PRODUCT_BUNDLE_IDENTIFIER need ""
         if (manifest.id) {
             xcodeProject.updateBuildProperty('PRODUCT_BUNDLE_IDENTIFIER', `"${manifest.id}"`);
         }
-        this.updateDeeplink((_a = manifest.protocol_handlers) !== null && _a !== void 0 ? _a : []);
+        let tempInfoPlistXML = infoPlistXML.slice(); // clone
+        tempInfoPlistXML = this.updateDeeplink((_a = manifest.protocol_handlers) !== null && _a !== void 0 ? _a : [], tempInfoPlistXML);
+        tempInfoPlistXML = this.updateSceneType((_b = manifest.xr_main_scene) === null || _b === void 0 ? void 0 : _b.type, tempInfoPlistXML);
+        this.writeInfoPlist(tempInfoPlistXML);
         await this.modifySwift(manifest);
     }
     static updateVersion(xcodeProject, version) {
         xcodeProject.updateBuildProperty('CURRENT_PROJECT_VERSION', version);
     }
-    static updateDeeplink(deeplinks) {
-        let infoPlistPath = (0, path_1.join)(resource_1.PROJECT_DIRECTORY, './web-spatial/Info.plist');
+    static writeInfoPlist(infoPlistXML) {
+        const infoPlistPath = (0, path_1.join)(resource_1.PROJECT_DIRECTORY, './web-spatial/Info.plist');
+        fs.writeFileSync(infoPlistPath, infoPlistXML);
+    }
+    static updateSceneType(sceneType, infoPlistXML) {
+        let sceneSessionRole = 'UIWindowSceneSessionRoleApplication';
+        if (sceneType === 'volume') {
+            sceneSessionRole = 'UIWindowSceneSessionRoleVolumetricApplication';
+        }
+        infoPlistXML = infoPlistXML.replace('SCENE_SESSION_ROLE', sceneSessionRole);
+        return infoPlistXML;
+    }
+    static updateDeeplink(deeplinks, infoPlistXML) {
         let deeplinkString = '';
         for (let i = 0; i < deeplinks.length; i++) {
             deeplinkString += `<string>${deeplinks[i].protocol}</string>`;
         }
         const newInfoPlist = infoPlistXML.replace('DEEPLINK', deeplinkString);
-        fs.writeFileSync(infoPlistPath, newInfoPlist);
+        return newInfoPlist;
     }
     static async modifySwift(manifest) {
         var _a;
-        const manifestSwiftPath = (0, path_1.join)(resource_1.PROJECT_DIRECTORY, './web-spatial/libs/webView/manifest.swift');
+        const manifestSwiftPath = (0, path_1.join)(resource_1.PROJECT_DIRECTORY, './web-spatial/manifest.swift');
         const xcodePackageJsonPath = (0, path_1.join)(resource_1.PROJECT_DIRECTORY, 'package.json');
         const packageJson = await (0, load_1.loadJsonFromDisk)(xcodePackageJsonPath);
         let manifestSwift = manifestSwiftTemplate_1.manifestSwiftTemplate;
@@ -233,6 +247,7 @@ class XcodeProject {
         }
         manifestSwift = manifestSwift.replace('SceneWidth', manifest.xr_main_scene.defaultSize.width);
         manifestSwift = manifestSwift.replace('SceneHeight', manifest.xr_main_scene.defaultSize.height);
+        manifestSwift = manifestSwift.replace('SceneDepth', manifest.xr_main_scene.defaultSize.depth);
         let res = 'nil';
         const resizabilities = ['minWidth', 'minHeight', 'maxWidth', 'maxHeight'];
         if (manifest.xr_main_scene.resizability) {
@@ -246,6 +261,10 @@ class XcodeProject {
             res += ')';
         }
         manifestSwift = manifestSwift.replace('SceneResizability', res);
+        manifestSwift = manifestSwift.replace('SceneType', manifest.xr_main_scene.type);
+        manifestSwift = manifestSwift.replace('WorldScaling', manifest.xr_main_scene.worldScaling);
+        manifestSwift = manifestSwift.replace('WorldAlignment', manifest.xr_main_scene.worldAlignment);
+        manifestSwift = manifestSwift.replace('BaseplateVisibility', manifest.xr_main_scene.baseplateVisibility);
         fs.writeFileSync(manifestSwiftPath, manifestSwift, 'utf-8');
     }
 }

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

@@ -32,6 +32,7 @@ export default class Xcrun {
     private static buildTestApp;
     private static terminateApp;
     private static installApp;
+    private static uninstallApp;
     private static launchApp;
     private static parseDestinationDevices;
     private static parseSupportDevices;

package/dist/lib/xcode/xcrun.js

@@ -111,7 +111,7 @@ class Xcrun {
         // launch visionOS simulator
         this.launchSimulator(device);
         try {
-            this.terminateApp(device.deviceId, appInfo.id);
+            this.uninstallApp(device.deviceId, appInfo.id);
         }
         catch (_a) { }
         // install app
@@ -182,6 +182,9 @@ class Xcrun {
         cmd.install(deviceId, appFile);
         (0, child_process_1.execSync)(cmd.line);
     }
+    static uninstallApp(deviceId, appId) {
+        (0, child_process_1.execSync)(new XcrunCMD().simctl().uninstall(deviceId, appId).line);
+    }
     static launchApp(deviceId, bundleId) {
         (0, child_process_1.execSync)(new XcrunCMD().simctl().launch(deviceId, bundleId).line);
     }
@@ -283,15 +286,22 @@ class Xcrun {
     /*
      * device info like:
      * Apple Vision Pro (8C7AD003-4039-478F-9F94-938876D57817) (Shutdown)
+     * Apple Vision Pro (xxx) (8C7AD003-4039-478F-9F94-938876D57817) (Shutdown)
      */
     static parseDeviceInfo(device) {
-        const info = device.split('(');
-        const deviceInfo = {
-            name: info[0].trim(),
-            deviceId: info[1].split(')')[0].trim(),
-            state: info[2].split(')')[0].trim(),
+        var _a;
+        const uuidRegex = /[A-F0-9]{8}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{12}/i;
+        const uuidMatch = (_a = device.match(uuidRegex)) !== null && _a !== void 0 ? _a : ["()"];
+        const deviceId = uuidMatch[0];
+        const name = device.substring(0, device.indexOf(deviceId) - 1).trim();
+        const statePart = device.substring(device.indexOf(deviceId) + deviceId.length).trim();
+        const stateMatch = statePart.match(/\(([^)]+)\)/);
+        const state = stateMatch ? stateMatch[1].trim() : 'Unknown';
+        return {
+            name: name,
+            deviceId: deviceId,
+            state: state
         };
-        return deviceInfo;
     }
     // Try to find an available simulator, if not, create one and save the running record for the next time direct use.
     static findSimulator(deviceId) {
@@ -433,6 +443,10 @@ class XcrunCMD {
         this.line += ` install "${device}" "${path}"`;
         return this;
     }
+    uninstall(device, packName) {
+        this.line += ` uninstall "${device}" "${packName}"`;
+        return this;
+    }
     launch(device, packName) {
         this.line += ` launch "${device}" "${packName}"`;
         return this;

package/dist/schema.json

@@ -0,0 +1,95 @@
+{
+    "$schema": "https://json-schema.org/draft-07/schema",
+    "title": "Schema for PWA Manifest",
+    "description": "Schema for PWA Manifest",
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string"
+        },
+        "start_url": {
+            "type": "string"
+        },
+        "display": {
+            "type": "string"
+        },
+        "xr_main_scene": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string",
+                    "enum": ["window", "volume"]
+                },
+                "default_size": {
+                    "type": "object",
+                    "properties": {
+                        "width": {
+                            "type": ["number", "string"]
+                        },
+                        "height": {
+                            "type": ["number", "string"]
+                        },
+                        "depth": {
+                            "type": ["number", "string"]
+                        }
+                    },
+                    "required": ["height", "width"]
+                },
+                "resizability": {
+                    "type": "object",
+                    "properties": {
+                        "minWidth": {
+                            "type": ["number", "string"]
+                        },
+                        "maxWidth": {
+                            "type": ["number", "string"]
+                        },
+                        "minHeight": {
+                            "type": ["number", "string"]
+                        },
+                        "maxHeight": {
+                            "type": ["number", "string"]
+                        }
+                    },
+                    "required": []
+                },
+                "worldScaling": {
+                    "enum": ["automatic", "dynamic"],
+                    "type": "string"
+                },
+                "worldAlignment": {
+                    "enum": ["adaptive", "automatic", "gravityAligned"],
+                    "type": "string"
+                },
+                "baseplateVisibility": {
+                    "enum": ["visible", "hidden", "automatic"],
+                    "type": "string"
+                }
+            },
+            "required": []
+        },
+        "icons": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "src": {
+                        "type": "string"
+                    },
+                    "sizes": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "purpose": {
+                        "type": "string"
+                    }
+                },
+                "required": ["purpose", "sizes", "src", "type"]
+            },
+            "minItems": 0
+        }
+    },
+    "required": ["display", "icons", "name", "start_url"]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webspatial/builder",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Client CLI tool to Generate XRApp project for Apple Vision Pro",
   "type": "commonjs",
   "engines": {
@@ -19,12 +19,13 @@
     "dist/assets",
     "dist/index.d.ts",
     "dist/index.js",
+    "dist/schema.json",
     "bin",
     "package.json",
     "README.md"
   ],
   "author": "",
-  "license": "ISC",
+  "license": "MIT",
   "dependencies": {
     "@resvg/resvg-js": "^2.6.2",
     "cli-progress": "^3.8.2",
@@ -40,7 +41,7 @@
     "sharp": "^0.33.5",
     "valid-url": "^1.0.9",
     "xcode": "^3.0.1",
-    "@webspatial/platform-visionos": "^1.0.4"
+    "@webspatial/platform-visionos": "^1.0.5"
   },
   "devDependencies": {
     "@rollup/plugin-terser": "^0.4.3",
@@ -74,7 +75,7 @@
     "build": "tsc && npm run copy-assets",
     "build1": "rollup -c ./rollup.config.js",
     "build2": "tsc && npm run copy-assets",
-    "copy-assets": "cp -R src/assets/ dist/assets/",
+    "copy-assets": "cp -R src/assets/ dist/assets/ && cp -R src/schema.json dist/",
     "clean": "rm -rf dist",
     "lint": "eslint \"src/**/*.{js,ts}\""
   }