@sitecore-content-sdk/nextjs 0.2.0-beta.10 → 0.2.0-beta.12

package/dist/cjs/tools/codegen/{extract-components.js → extract-files.js}

@@ -12,16 +12,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractComponents = void 0;
+exports.extractFiles = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const utils_1 = require("./utils");
 const core_1 = require("@sitecore-content-sdk/core");
 const tools_1 = require("@sitecore-content-sdk/core/tools");
+const path_1 = __importDefault(require("path"));
 /**
  * Extracts components from the app folder and sends them to XMCloud.
- * @param {ExtractComponentsConfig} args - Config for components extraction
+ * @param {ExtractFilesConfig} args - Config for components extraction
  */
-const extractComponents = (args) => {
+const extractFiles = (args) => {
     const authParams = {
         clientId: process.env.SITECORE_AUTH_CLIENT_ID || '',
         clientSecret: process.env.SITECORE_AUTH_CLIENT_SECRET || '',
@@ -39,26 +40,37 @@ const extractComponents = (args) => {
         }
         const basePath = process.cwd();
         try {
+            // MESH_URL is temporary option to use until mesh is onboarded into Edge Proxy
+            const targetUrl = process.env.SITECORE_MESH_URL || args.scConfig.api.edge.edgeUrl;
             const bearer = yield (0, tools_1.fetchBearerToken)(authParams);
             if (!bearer) {
                 console.error(chalk_1.default.red('Failed to get bearer token, aborting code extraction'));
                 return;
             }
             const componentPaths = yield (0, utils_1.resolveComponentImportFiles)(basePath, args.componentMapPath);
-            const codeDispatches = Array.from(componentPaths, (mapEntry) => (0, utils_1.sendCode)({
+            const fileDispatches = Array.from(componentPaths, (mapEntry) => (0, utils_1.sendCode)({
                 file: {
                     name: mapEntry[0],
                     path: mapEntry[1],
                     type: utils_1.ExtractedFileType.Component,
                 },
                 token: bearer,
-                edgeUrl: args.scConfig.api.edge.edgeUrl,
+                targetUrl,
             }));
-            yield Promise.all(codeDispatches);
+            fileDispatches.push((0, utils_1.sendCode)({
+                file: {
+                    name: 'package.json',
+                    path: path_1.default.resolve(basePath, './package.json'),
+                    type: utils_1.ExtractedFileType.PackageJson,
+                },
+                token: bearer,
+                targetUrl,
+            }));
+            yield Promise.all(fileDispatches);
         }
         catch (error) {
             console.error(chalk_1.default.red('Error during component extraction:', error));
         }
     });
 };
-exports.extractComponents = extractComponents;
+exports.extractFiles = extractFiles;

package/dist/cjs/tools/codegen/utils.js

@@ -58,7 +58,7 @@ var ExtractedFileType;
 (function (ExtractedFileType) {
     ExtractedFileType["Component"] = "component";
     ExtractedFileType["Json"] = "json";
-    ExtractedFileType["Package"] = "package.json";
+    ExtractedFileType["PackageJson"] = "package.json";
 })(ExtractedFileType || (exports.ExtractedFileType = ExtractedFileType = {}));
 /**
  * Validates consent for code extraction procedures
@@ -95,10 +95,10 @@ exports.validateDeployContext = validateDeployContext;
  * Parses the componentBuilder.ts file and returns a map of component names
  * and their respective import strings
  * @param {string} appPath path to the JSS app root
- * @param {string} [componentMapPath] path to the app's component map file. Default: 'src/lib/componentMap.ts'
+ * @param {string} [componentMapPath] path to the app's component map file. Default: 'src/lib/component-map.ts'
  * @returns map of component names and their respective import strings
  */
-const resolveComponentImportFiles = (appPath, componentMapPath = './src/lib/componentMap.ts') => {
+const resolveComponentImportFiles = (appPath, componentMapPath = './src/lib/component-map.ts') => {
     appPath = path_1.default.isAbsolute(appPath) ? appPath : path_1.default.resolve(process.cwd(), appPath);
     const tsConfig = ts.readConfigFile(path_1.default.resolve(appPath, 'tsconfig.json'), ts.sys.readFile);
     if (tsConfig.error) {
@@ -164,8 +164,10 @@ const resolveComponentImportFiles = (appPath, componentMapPath = './src/lib/comp
             const resolvedModule = ts.nodeModuleNameResolver(moduleName, componentMapFullPath, cliCompilerOptions, tsHost);
             const resolvedFile = (_a = resolvedModule === null || resolvedModule === void 0 ? void 0 : resolvedModule.resolvedModule) === null || _a === void 0 ? void 0 : _a.resolvedFileName;
             // module imports will be resolved to /node_modules location - we don't support that yet
-            if (resolvedFile && resolvedFile.indexOf('node_modules') === -1) {
-                importStringsMap[childNode.importClause.getText()] = path_1.default.resolve(resolvedFile);
+            if (resolvedFile) {
+                if (resolvedFile.indexOf('node_modules') === -1 && !resolvedFile.endsWith('.d.ts')) {
+                    importStringsMap[childNode.importClause.getText()] = path_1.default.resolve(resolvedFile);
+                }
             }
             else {
                 console.warn('Could not resolve a file for import %s', moduleName);
@@ -222,34 +224,44 @@ const resolveComponentImportFiles = (appPath, componentMapPath = './src/lib/comp
     return componentImportsMap;
 };
 exports.resolveComponentImportFiles = resolveComponentImportFiles;
-const sendCode = (_a) => __awaiter(void 0, [_a], void 0, function* ({ file, token, edgeUrl, }) {
-    const meshEndpoint = `${edgeUrl || core_1.constants.SITECORE_EDGE_URL_DEFAULT}/api/v1/mesh`;
+const sendCode = (_a) => __awaiter(void 0, [_a], void 0, function* ({ file, token, targetUrl, }) {
+    const apiEndpoint = `${targetUrl}/api/v1/contentsdk/code/extracted`;
     if (!fs_1.default.existsSync(file.path)) {
-        console.error(chalk_1.default.red(`Component file not found: ${file.path}`));
+        console.error(chalk_1.default.red(`File not found: ${file.path}`));
         return;
     }
     const code = fs_1.default.readFileSync(file.path);
-    const response = yield fetch(meshEndpoint, {
-        method: 'POST',
-        headers: {
-            Authorization: `Bearer ${token}`,
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-            name: file.name,
-            content: code.toString(),
-            labels: {
-                properties: {
+    try {
+        const response = yield fetch(apiEndpoint, {
+            method: 'POST',
+            headers: {
+                Authorization: `Bearer ${token}`,
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                // EnvironmentId can have any value - but it's required
+                EnvironmentId: 'ContentSDK',
+                name: file.name,
+                content: code.toString(),
+                labels: {
                     type: file.type,
                 },
-            },
-        }),
-    });
-    if (!response.ok) {
-        console.error(chalk_1.default.red(`Failed to send extracted code from ${file.path}: ${response.statusText}`));
+            }),
+        });
+        if (!response.ok) {
+            console.error(chalk_1.default.red(`Failed to send extracted code from ${file.path}: ${response.statusText}`));
+            core_1.debug.http('Error details: %o', {
+                status: response.status,
+                text: yield response.text(),
+                url: response.url,
+                headers: response.headers,
+            });
+        }
     }
-    else {
-        console.log(chalk_1.default.green(`Code from ${file.path} extracted and sent to mesh endpoint`));
+    catch (error) {
+        console.error(chalk_1.default.red(`Fetch request to send extracted code from ${file.path} failed: ${JSON.stringify(error)}`));
+        return;
     }
+    console.log(chalk_1.default.green(`Contents from ${file.path} extracted and sent to mesh endpoint`));
 });
 exports.sendCode = sendCode;

package/dist/cjs/tools/index.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractComponents = exports.ModuleType = exports.generatePlugins = exports.getComponentList = exports.generateMetadata = exports.generateSites = void 0;
+exports.extractFiles = exports.ModuleType = exports.generatePlugins = exports.getComponentList = exports.generateMetadata = exports.generateSites = void 0;
 var tools_1 = require("@sitecore-content-sdk/core/tools");
 Object.defineProperty(exports, "generateSites", { enumerable: true, get: function () { return tools_1.generateSites; } });
 Object.defineProperty(exports, "generateMetadata", { enumerable: true, get: function () { return tools_1.generateMetadata; } });
 Object.defineProperty(exports, "getComponentList", { enumerable: true, get: function () { return tools_1.getComponentList; } });
 Object.defineProperty(exports, "generatePlugins", { enumerable: true, get: function () { return tools_1.generatePlugins; } });
 Object.defineProperty(exports, "ModuleType", { enumerable: true, get: function () { return tools_1.ModuleType; } });
-var extract_components_1 = require("./codegen/extract-components");
-Object.defineProperty(exports, "extractComponents", { enumerable: true, get: function () { return extract_components_1.extractComponents; } });
+var extract_files_1 = require("./codegen/extract-files");
+Object.defineProperty(exports, "extractFiles", { enumerable: true, get: function () { return extract_files_1.extractFiles; } });

package/dist/esm/tools/codegen/{extract-components.js → extract-files.js}

@@ -11,11 +11,12 @@ import chalk from 'chalk';
 import { ExtractedFileType, resolveComponentImportFiles, sendCode, validateConsent, validateDeployContext, } from './utils';
 import { constants } from '@sitecore-content-sdk/core';
 import { fetchBearerToken } from '@sitecore-content-sdk/core/tools';
+import path from 'path';
 /**
  * Extracts components from the app folder and sends them to XMCloud.
- * @param {ExtractComponentsConfig} args - Config for components extraction
+ * @param {ExtractFilesConfig} args - Config for components extraction
  */
-export const extractComponents = (args) => {
+export const extractFiles = (args) => {
     const authParams = {
         clientId: process.env.SITECORE_AUTH_CLIENT_ID || '',
         clientSecret: process.env.SITECORE_AUTH_CLIENT_SECRET || '',
@@ -33,22 +34,33 @@ export const extractComponents = (args) => {
         }
         const basePath = process.cwd();
         try {
+            // MESH_URL is temporary option to use until mesh is onboarded into Edge Proxy
+            const targetUrl = process.env.SITECORE_MESH_URL || args.scConfig.api.edge.edgeUrl;
             const bearer = yield fetchBearerToken(authParams);
             if (!bearer) {
                 console.error(chalk.red('Failed to get bearer token, aborting code extraction'));
                 return;
             }
             const componentPaths = yield resolveComponentImportFiles(basePath, args.componentMapPath);
-            const codeDispatches = Array.from(componentPaths, (mapEntry) => sendCode({
+            const fileDispatches = Array.from(componentPaths, (mapEntry) => sendCode({
                 file: {
                     name: mapEntry[0],
                     path: mapEntry[1],
                     type: ExtractedFileType.Component,
                 },
                 token: bearer,
-                edgeUrl: args.scConfig.api.edge.edgeUrl,
+                targetUrl,
             }));
-            yield Promise.all(codeDispatches);
+            fileDispatches.push(sendCode({
+                file: {
+                    name: 'package.json',
+                    path: path.resolve(basePath, './package.json'),
+                    type: ExtractedFileType.PackageJson,
+                },
+                token: bearer,
+                targetUrl,
+            }));
+            yield Promise.all(fileDispatches);
         }
         catch (error) {
             console.error(chalk.red('Error during component extraction:', error));

package/dist/esm/tools/codegen/utils.js

@@ -11,7 +11,7 @@ import chalk from 'chalk';
 import path from 'path';
 import fs from 'fs';
 import * as ts from 'typescript';
-import { constants } from '@sitecore-content-sdk/core';
+import { debug } from '@sitecore-content-sdk/core';
 /**
  * Type of file to be sent to the mesh endpoint
  */
@@ -19,7 +19,7 @@ export var ExtractedFileType;
 (function (ExtractedFileType) {
     ExtractedFileType["Component"] = "component";
     ExtractedFileType["Json"] = "json";
-    ExtractedFileType["Package"] = "package.json";
+    ExtractedFileType["PackageJson"] = "package.json";
 })(ExtractedFileType || (ExtractedFileType = {}));
 /**
  * Validates consent for code extraction procedures
@@ -54,10 +54,10 @@ export const validateDeployContext = () => {
  * Parses the componentBuilder.ts file and returns a map of component names
  * and their respective import strings
  * @param {string} appPath path to the JSS app root
- * @param {string} [componentMapPath] path to the app's component map file. Default: 'src/lib/componentMap.ts'
+ * @param {string} [componentMapPath] path to the app's component map file. Default: 'src/lib/component-map.ts'
  * @returns map of component names and their respective import strings
  */
-export const resolveComponentImportFiles = (appPath, componentMapPath = './src/lib/componentMap.ts') => {
+export const resolveComponentImportFiles = (appPath, componentMapPath = './src/lib/component-map.ts') => {
     appPath = path.isAbsolute(appPath) ? appPath : path.resolve(process.cwd(), appPath);
     const tsConfig = ts.readConfigFile(path.resolve(appPath, 'tsconfig.json'), ts.sys.readFile);
     if (tsConfig.error) {
@@ -123,8 +123,10 @@ export const resolveComponentImportFiles = (appPath, componentMapPath = './src/l
             const resolvedModule = ts.nodeModuleNameResolver(moduleName, componentMapFullPath, cliCompilerOptions, tsHost);
             const resolvedFile = (_a = resolvedModule === null || resolvedModule === void 0 ? void 0 : resolvedModule.resolvedModule) === null || _a === void 0 ? void 0 : _a.resolvedFileName;
             // module imports will be resolved to /node_modules location - we don't support that yet
-            if (resolvedFile && resolvedFile.indexOf('node_modules') === -1) {
-                importStringsMap[childNode.importClause.getText()] = path.resolve(resolvedFile);
+            if (resolvedFile) {
+                if (resolvedFile.indexOf('node_modules') === -1 && !resolvedFile.endsWith('.d.ts')) {
+                    importStringsMap[childNode.importClause.getText()] = path.resolve(resolvedFile);
+                }
             }
             else {
                 console.warn('Could not resolve a file for import %s', moduleName);
@@ -180,33 +182,43 @@ export const resolveComponentImportFiles = (appPath, componentMapPath = './src/l
     }
     return componentImportsMap;
 };
-export const sendCode = (_a) => __awaiter(void 0, [_a], void 0, function* ({ file, token, edgeUrl, }) {
-    const meshEndpoint = `${edgeUrl || constants.SITECORE_EDGE_URL_DEFAULT}/api/v1/mesh`;
+export const sendCode = (_a) => __awaiter(void 0, [_a], void 0, function* ({ file, token, targetUrl, }) {
+    const apiEndpoint = `${targetUrl}/api/v1/contentsdk/code/extracted`;
     if (!fs.existsSync(file.path)) {
-        console.error(chalk.red(`Component file not found: ${file.path}`));
+        console.error(chalk.red(`File not found: ${file.path}`));
         return;
     }
     const code = fs.readFileSync(file.path);
-    const response = yield fetch(meshEndpoint, {
-        method: 'POST',
-        headers: {
-            Authorization: `Bearer ${token}`,
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-            name: file.name,
-            content: code.toString(),
-            labels: {
-                properties: {
+    try {
+        const response = yield fetch(apiEndpoint, {
+            method: 'POST',
+            headers: {
+                Authorization: `Bearer ${token}`,
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                // EnvironmentId can have any value - but it's required
+                EnvironmentId: 'ContentSDK',
+                name: file.name,
+                content: code.toString(),
+                labels: {
                     type: file.type,
                 },
-            },
-        }),
-    });
-    if (!response.ok) {
-        console.error(chalk.red(`Failed to send extracted code from ${file.path}: ${response.statusText}`));
+            }),
+        });
+        if (!response.ok) {
+            console.error(chalk.red(`Failed to send extracted code from ${file.path}: ${response.statusText}`));
+            debug.http('Error details: %o', {
+                status: response.status,
+                text: yield response.text(),
+                url: response.url,
+                headers: response.headers,
+            });
+        }
     }
-    else {
-        console.log(chalk.green(`Code from ${file.path} extracted and sent to mesh endpoint`));
+    catch (error) {
+        console.error(chalk.red(`Fetch request to send extracted code from ${file.path} failed: ${JSON.stringify(error)}`));
+        return;
     }
+    console.log(chalk.green(`Contents from ${file.path} extracted and sent to mesh endpoint`));
 });

package/dist/esm/tools/index.js

@@ -1,2 +1,2 @@
 export { generateSites, generateMetadata, getComponentList, generatePlugins, ModuleType, } from '@sitecore-content-sdk/core/tools';
-export { extractComponents } from './codegen/extract-components';
+export { extractFiles } from './codegen/extract-files';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-content-sdk/nextjs",
-  "version": "0.2.0-beta.10",
+  "version": "0.2.0-beta.12",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -79,15 +79,15 @@
   },
   "dependencies": {
     "@babel/parser": "^7.27.2",
-    "@sitecore-content-sdk/core": "0.2.0-beta.10",
-    "@sitecore-content-sdk/react": "0.2.0-beta.10",
+    "@sitecore-content-sdk/core": "0.2.0-beta.12",
+    "@sitecore-content-sdk/react": "0.2.0-beta.12",
     "recast": "^0.23.11",
     "regex-parser": "^2.3.1",
     "sync-disk-cache": "^2.1.0"
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "09e81ed8bdcda02e595ddaac7b5d911d5b1b689e",
+  "gitHead": "0f881567f6a9a60932f17d6c0397f54f1ce7673c",
   "files": [
     "dist",
     "types",

package/types/tools/codegen/extract-files.d.ts

@@ -0,0 +1,10 @@
+import { SitecoreConfig } from '@sitecore-content-sdk/core/config';
+export type ExtractFilesConfig = {
+    scConfig: SitecoreConfig;
+    componentMapPath?: string;
+};
+/**
+ * Extracts components from the app folder and sends them to XMCloud.
+ * @param {ExtractFilesConfig} args - Config for components extraction
+ */
+export declare const extractFiles: (args: ExtractFilesConfig) => () => Promise<void>;

package/types/tools/codegen/utils.d.ts

@@ -12,7 +12,7 @@ export type ExtractedFile = {
 export declare enum ExtractedFileType {
     Component = "component",
     Json = "json",
-    Package = "package.json"
+    PackageJson = "package.json"
 }
 /**
  * Validates consent for code extraction procedures
@@ -29,12 +29,12 @@ export declare const validateDeployContext: () => boolean;
  * Parses the componentBuilder.ts file and returns a map of component names
  * and their respective import strings
  * @param {string} appPath path to the JSS app root
- * @param {string} [componentMapPath] path to the app's component map file. Default: 'src/lib/componentMap.ts'
+ * @param {string} [componentMapPath] path to the app's component map file. Default: 'src/lib/component-map.ts'
  * @returns map of component names and their respective import strings
  */
 export declare const resolveComponentImportFiles: (appPath: string, componentMapPath?: string) => Map<string, string>;
-export declare const sendCode: ({ file, token, edgeUrl, }: {
+export declare const sendCode: ({ file, token, targetUrl, }: {
     file: ExtractedFile;
     token: string;
-    edgeUrl?: string;
+    targetUrl: string;
 }) => Promise<void>;

package/types/tools/index.d.ts

@@ -1,2 +1,2 @@
 export { generateSites, GenerateSitesConfig, generateMetadata, ComponentFile, PackageDefinition, getComponentList, PluginDefinition, generatePlugins, ModuleType, } from '@sitecore-content-sdk/core/tools';
-export { extractComponents } from './codegen/extract-components';
+export { extractFiles } from './codegen/extract-files';

package/types/tools/codegen/extract-components.d.ts

@@ -1,10 +0,0 @@
-import { SitecoreConfig } from '@sitecore-content-sdk/core/config';
-export type ExtractComponentsConfig = {
-    scConfig: SitecoreConfig;
-    componentMapPath?: string;
-};
-/**
- * Extracts components from the app folder and sends them to XMCloud.
- * @param {ExtractComponentsConfig} args - Config for components extraction
- */
-export declare const extractComponents: (args: ExtractComponentsConfig) => () => Promise<void>;