@salesforce/b2c-cli 2.0.0 → 2.1.0

package/dist/script-types/node_modules/@salesforce/b2c-script-types/plugin/index.js

@@ -37,8 +37,9 @@ const SFRA_AMBIENT_MODULES = new Set([
 ]);
 // Candidate suffixes appended when resolving a SFCC-style relative require to
 // a cartridge file. SFRA convention is to omit the .js extension, so .js wins
-// first; .json captures the occasional resource bundle import.
-const CANDIDATE_EXTENSIONS = ['.js', '.json', '/index.js'];
+// first; .json captures the occasional resource bundle import; .ds covers
+// legacy pipeline-era scripts, which the platform also resolves after .js.
+const CANDIDATE_EXTENSIONS = ['.js', '.json', '.ds', '/index.js', '/index.ds'];
 // Cartridges that conventionally sit at the bottom of the cartridge path when
 // the user hasn't told us otherwise (no `cartridges` in dw.json/SFCC_CARTRIDGES).
 // Higher rank = lower in the cartridge path. SFRA's runtime path ends with
@@ -77,7 +78,12 @@ function init({ typescript: ts }) {
     const setCartridges = (list) => {
         cartridges = list.map(({ name, src }) => {
             const n = normalize(src);
-            return { name, root: n.endsWith('/') ? n : n + '/' };
+            const raw = src.replace(/\\/g, '/');
+            return {
+                name,
+                root: n.endsWith('/') ? n : n + '/',
+                srcRoot: raw.endsWith('/') ? raw : raw + '/',
+            };
         });
     };
     const applyConfig = (config) => {
@@ -275,7 +281,7 @@ function init({ typescript: ts }) {
         if (!subpath)
             return undefined;
         for (const c of order) {
-            const baseAbs = c.root + subpath;
+            const baseAbs = c.srcRoot + subpath;
             for (const ext of CANDIDATE_EXTENSIONS) {
                 const candidate = baseAbs + ext;
                 if (fileExists(candidate)) {
@@ -307,7 +313,7 @@ function init({ typescript: ts }) {
         const modulesCart = cartridges.find((c) => c.name === 'modules');
         if (!modulesCart)
             return undefined;
-        const baseAbs = modulesCart.root + moduleName;
+        const baseAbs = modulesCart.srcRoot + moduleName;
         for (const ext of CANDIDATE_EXTENSIONS) {
             const candidate = baseAbs + ext;
             if (fileExists(candidate)) {
@@ -322,7 +328,7 @@ function init({ typescript: ts }) {
                 if (content) {
                     const main = JSON.parse(content).main;
                     if (typeof main === 'string' && main.length > 0) {
-                        const resolved = (modulesCart.root + moduleName + '/' + main.replace(/^\.\//, '')).replace(/\\/g, '/');
+                        const resolved = (modulesCart.srcRoot + moduleName + '/' + main.replace(/^\.\//, '')).replace(/\\/g, '/');
                         if (fileExists(resolved)) {
                             return { resolved, source: modulesCart.name };
                         }
@@ -430,6 +436,17 @@ function init({ typescript: ts }) {
             }
             return additions.length > 0 ? [...list, ...additions] : list;
         };
+        // TS derives a file's ScriptKind from its extension and falls back to TS
+        // for anything it doesn't recognize, which would parse legacy .ds scripts
+        // as TypeScript. Report JS so they get the same JavaScript semantics
+        // (allowJs/checkJs, JSDoc types) as their .js siblings. Returning Unknown
+        // for everything else lets TS fall back to its own extension mapping.
+        const origGetScriptKind = host.getScriptKind?.bind(host);
+        host.getScriptKind = (fileName) => {
+            if (enabled && fileName.endsWith('.ds'))
+                return ts.ScriptKind.JS;
+            return origGetScriptKind ? origGetScriptKind(fileName) : ts.ScriptKind.Unknown;
+        };
         const origResolveModuleNameLiterals = host.resolveModuleNameLiterals?.bind(host);
         if (origResolveModuleNameLiterals) {
             host.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, reusedNames) => {
@@ -538,7 +555,7 @@ function init({ typescript: ts }) {
             const moduleName = sfraModuleAtOffset(def.textSpan.start);
             if (!moduleName)
                 return def;
-            const candidates = [modulesCart.root + moduleName + '.js', modulesCart.root + moduleName + '/index.js'];
+            const candidates = [modulesCart.srcRoot + moduleName + '.js', modulesCart.srcRoot + moduleName + '/index.js'];
             for (const candidate of candidates) {
                 if (fileExists(candidate)) {
                     return { ...def, fileName: candidate, textSpan: { start: 0, length: 0 } };