eoas 3.1.1 → 3.1.2-beta2

package/dist/commands/init.js

@@ -105,9 +105,22 @@ class Init extends core_1.Command {
                 .replace(/\\/g, '\\\\')
                 .replace(/'/g, "\\'")}'`,
             enabled: true,
+            // Branch surfing: a build on a channel that allows it can be pointed at
+            // another branch at runtime, and expo-updates only accepts an override for
+            // header keys that already existed at build time — so these have to be
+            // declared here even when the value is empty. Dropping one of them does not
+            // disable the feature, it strips that header from every poll for the rest of
+            // the install; the picker refuses to appear rather than let that happen.
             requestHeaders: {
-                'expo-channel-name': 'process.env.RELEASE_CHANNEL',
+                'expo-channel-name': {
+                    __comment: 'Declare as a literal if you surf branches: see xprem-branch below.',
+                    value: 'process.env.RELEASE_CHANNEL',
+                },
                 'expo-app-id': appId,
+                'xprem-branch': {
+                    __comment: 'Branch surfing — the branch to serve; empty means the channel decides.',
+                    value: '',
+                },
             },
         };
         const updateConfigSpinner = (0, ora_1.ora)('Updating Expo config').start();

package/dist/lib/expoConfig.d.ts

@@ -24,4 +24,10 @@ export declare function getExpoConfigUpdateUrl(config: ExpoConfig): string | und
 export declare function getExpoAppId(config: ExpoConfig): string | undefined;
 export declare function requireExpoAppId(config: ExpoConfig): string;
 export declare function createOrModifyExpoConfigAsync(projectDir: string, exp: Record<string, any>): Promise<void>;
+export type CommentedValue = {
+    __comment: string;
+    value: any;
+};
+/** Strips the comment wrappers, for the JSON path and for reading values back. */
+export declare function unwrapValue(value: any): any;
 export declare function resolveServerUrl(config: ExpoConfig, customServerUrl?: string): Promise<string>;

package/dist/lib/expoConfig.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveServerUrl = exports.createOrModifyExpoConfigAsync = exports.requireExpoAppId = exports.getExpoAppId = exports.getExpoConfigUpdateUrl = exports.getPublicExpoConfigAsync = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfigAsync = exports.RequestedPlatform = void 0;
+exports.resolveServerUrl = exports.unwrapValue = exports.createOrModifyExpoConfigAsync = exports.requireExpoAppId = exports.getExpoAppId = exports.getExpoConfigUpdateUrl = exports.getPublicExpoConfigAsync = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfigAsync = exports.RequestedPlatform = void 0;
 const tslib_1 = require("tslib");
 // This file is copied from eas-cli[https://github.com/expo/eas-cli] to ensure consistent user experience across the CLI.
 const config_1 = require("@expo/config");
@@ -254,7 +254,33 @@ function updateObjectExpression(j, configObject, updates) {
         configObject.properties.push(newProperty);
     });
 }
+// The key is deliberately underscored: it is a sentinel this module reads and
+// strips, and it must not be mistakable for a real Expo config field.
+function isCommented(value) {
+    if (typeof value !== 'object' || value === null || !('value' in value)) {
+        return false;
+    }
+    // eslint-disable-next-line no-underscore-dangle
+    return typeof value.__comment === 'string';
+}
+/** Strips the comment wrappers, for the JSON path and for reading values back. */
+function unwrapValue(value) {
+    if (isCommented(value)) {
+        return unwrapValue(value.value);
+    }
+    if (Array.isArray(value)) {
+        return value.map(unwrapValue);
+    }
+    if (typeof value === 'object' && value !== null) {
+        return Object.fromEntries(Object.entries(value).map(([key, val]) => [key, unwrapValue(val)]));
+    }
+    return value;
+}
+exports.unwrapValue = unwrapValue;
 function createValueNode(j, value) {
+    if (isCommented(value)) {
+        return createValueNode(j, value.value);
+    }
     if (typeof value === 'string' && value.startsWith('process.env.')) {
         if (/^process\.env\.\w+$/.test(value)) {
             return j.memberExpression(j.memberExpression(j.identifier('process'), j.identifier('env')), j.identifier(value.split('.')[2]));
@@ -262,8 +288,15 @@ function createValueNode(j, value) {
         return parseExpressionNode(j, value);
     }
     if (typeof value === 'object' && value !== null) {
-        return j.objectExpression(Object.entries(value).map(([key, val]) => j.objectProperty(j.stringLiteral(key), createValueNode(j, val)) // Force stringLiteral pour garder les guillemets
-        ));
+        return j.objectExpression(Object.entries(value).map(([key, val]) => {
+            // Force stringLiteral pour garder les guillemets
+            const property = j.objectProperty(j.stringLiteral(key), createValueNode(j, val));
+            if (isCommented(val)) {
+                // eslint-disable-next-line no-underscore-dangle -- see isCommented
+                property.comments = [j.commentLine(` ${val.__comment}`, true, false)];
+            }
+            return property;
+        }));
     }
     return j.literal(value);
 }
@@ -276,7 +309,7 @@ function parseExpressionNode(j, code) {
 // contents (backslashes in Windows paths, quotes, ...).
 function stringifyWithEnv(obj) {
     const rawExpressions = [];
-    const json = JSON.stringify(obj, (_key, value) => typeof value === 'string' && value.startsWith('process.env.')
+    const json = JSON.stringify(unwrapValue(obj), (_key, value) => typeof value === 'string' && value.startsWith('process.env.')
         ? `__RAW_EXPR_${rawExpressions.push(value) - 1}__`
         : value, 2);
     return json.replace(/"__RAW_EXPR_(\d+)__"/g, (_match, index) => rawExpressions[Number(index)]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoas",
-  "version": "3.1.1",
+  "version": "3.1.2-beta2",
   "main": "index.js",
   "scripts": {
     "build": "tsc --project tsconfig.json",