@webspatial/builder 1.3.0 → 1.4.0

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

@@ -1,3 +1,4 @@
 import { ConsoleLog } from './Log';
 export declare function parseRouter(url: string): string;
+export declare function getInstalledPackageVersion(packageName: string, resolveFromDir?: string): string | null;
 export declare const CliLog: ConsoleLog;

package/dist/lib/utils/utils.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CliLog = void 0;
 exports.parseRouter = parseRouter;
+exports.getInstalledPackageVersion = getInstalledPackageVersion;
+const fs = require("fs");
+const path_1 = require("path");
 const Log_1 = require("./Log");
 function parseRouter(url) {
     let urlParts = url.split('/');
@@ -12,4 +15,35 @@ function parseRouter(url) {
     }
     return pathUrl;
 }
+// Why not `require('@scope/pkg/package.json')`?
+// Many packages define `exports` which can block direct access to `package.json`.
+// This function resolves the package entrypoint first, then walks up to find the
+// package root `package.json` on disk.
+function getInstalledPackageVersion(packageName, resolveFromDir = process.cwd()) {
+    let entry;
+    try {
+        // Let Node resolve the package from the given directory.
+        entry = require.resolve(packageName, { paths: [resolveFromDir] });
+    }
+    catch (_a) {
+        return null;
+    }
+    let dir = (0, path_1.dirname)(entry);
+    // Walk up parent directories until we hit the package root.
+    // The `20` is a safety cap to avoid pathological cases (e.g. unexpected paths).
+    for (let i = 0; i < 20; i += 1) {
+        const packageJsonPath = (0, path_1.join)(dir, 'package.json');
+        if (fs.existsSync(packageJsonPath)) {
+            const pkg = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+            if ((pkg === null || pkg === void 0 ? void 0 : pkg.name) === packageName) {
+                return typeof pkg.version === 'string' ? pkg.version : null;
+            }
+        }
+        const parent = (0, path_1.dirname)(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return null;
+}
 exports.CliLog = new Log_1.ConsoleLog('webspatial-builder');

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: 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";
+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    var useMainScene: Bool = true\n    private var shellVersion: String = \"WS_SHELL_VERSION\"\n    private var sdkVersion: String = \"WS_SDK_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, relativeTo: startUrl)!.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 getShellVersion() -> String {\n        return shellVersion\n    }\n    \n    func getSdkVersion() -> String {\n        return sdkVersion\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

@@ -31,7 +31,9 @@ struct PWAManager: Codable {
         worldAlignment: .WorldAlignment,
         baseplateVisibility: .BaseplateVisibility
     )
-    private var version: String = "PACKAGE_VERSION"
+    var useMainScene: Bool = true
+    private var shellVersion: String = "WS_SHELL_VERSION"
+    private var sdkVersion: String = "WS_SDK_VERSION"
 
     mutating func _init() {
         let urlType = start_url.split(separator: "://").first
@@ -41,7 +43,7 @@ struct PWAManager: Codable {
             }
             let startUrl = Bundle.main.url(forResource: start_url, withExtension: "", subdirectory: "")
             start_url = startUrl!.absoluteString
-            scope = URL(string: (scope.starts(with: "/") ? "." : "./") + scope, relativeTo: Bundle.main.executableURL)!.absoluteString
+            scope = URL(string: scope, relativeTo: startUrl)!.absoluteString
             isLocal = true
         }
 
@@ -95,8 +97,12 @@ struct PWAManager: Codable {
         return resource
     }
     
-    func getVersion() -> String {
-        return version
+    func getShellVersion() -> String {
+        return shellVersion
+    }
+    
+    func getSdkVersion() -> String {
+        return sdkVersion
     }
 }
 

package/dist/lib/xcode/xcodeproject.js

@@ -6,6 +6,7 @@ const path_1 = require("path");
 const load_1 = require("../resource/load");
 const imageHelper_1 = require("../resource/imageHelper");
 const manifestSwiftTemplate_1 = require("./manifestSwiftTemplate");
+const utils_1 = require("../utils/utils");
 const xcode = require('xcode');
 const exportOptionsXML = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -226,12 +227,14 @@ class XcodeProject {
         return newInfoPlist;
     }
     static async modifySwift(manifest) {
-        var _a;
+        var _a, _b;
         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;
-        manifestSwift = manifestSwift.replace('PACKAGE_VERSION', (_a = packageJson.version) !== null && _a !== void 0 ? _a : '0.0.0');
+        manifestSwift = manifestSwift.replace('WS_SHELL_VERSION', (_a = packageJson.version) !== null && _a !== void 0 ? _a : '0.0.0');
+        manifestSwift = manifestSwift.replace('WS_SDK_VERSION', (_b = (0, utils_1.getInstalledPackageVersion)('@webspatial/core-sdk')) !== null && _b !== void 0 ? _b : '0.0.0');
+        console.log('versions:', packageJson.version, (0, utils_1.getInstalledPackageVersion)('@webspatial/core-sdk'));
         manifestSwift = manifestSwift.replace('START_URL', manifest.start_url);
         manifestSwift = manifestSwift.replace('SCOPE', manifest.scope);
         manifestSwift = manifestSwift.replace('AppName', manifest.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webspatial/builder",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Client CLI tool to Generate XRApp project for Apple Vision Pro",
   "type": "commonjs",
   "engines": {
@@ -41,7 +41,7 @@
     "sharp": "^0.33.5",
     "valid-url": "^1.0.9",
     "xcode": "^3.0.1",
-    "@webspatial/platform-visionos": "^1.3.0"
+    "@webspatial/platform-visionos": "^1.4.0"
   },
   "devDependencies": {
     "@rollup/plugin-terser": "^0.4.3",
@@ -67,6 +67,7 @@
   "scripts": {
     "start": "tsc -w",
     "test": "tsc",
+    "test:unit": "tsc && node --test \"test/**/*.test.js\"",
     "test0": "npm run build && bin/bundlepwa.js test",
     "test1": "npm run build && bin/bundlepwa.js build --manifest=../testLocal/manifest.json --project=../testLocal --export=./export --version=1.0 --teamId=teamId",
     "test2": "npm run build && bin/bundlepwa.js publish --manifest=../pack-test/pwa_test.json --project=../pack-test --version=1.0 --teamId=teamId --u=username --p=password",