@ordergroove/smi-serve 1.6.1 → 1.6.2

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.2](https://github.com/ordergroove/plush-toys/compare/@ordergroove/smi-serve@1.6.1...@ordergroove/smi-serve@1.6.2) (2024-04-18)
+
+
+### Bug Fixes
+
+* **smi-serve:** Don't return 'latest', rather actual value ([70053a4](https://github.com/ordergroove/plush-toys/commit/70053a421c6f6ada54709cedf0bea26801b330af))
+
+
+
+
+
 ## [1.6.1](https://github.com/ordergroove/plush-toys/compare/@ordergroove/smi-serve@1.6.0...@ordergroove/smi-serve@1.6.1) (2024-04-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/smi-serve",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Utility to serve a SMI template locally",
   "keywords": [],
   "author": "Eugenio Lattanzio <eugenio.lattanzio@ordergroove.com>",
@@ -32,5 +32,5 @@
     "ora": "^5.4.1",
     "yargs": "^17.7.2"
   },
-  "gitHead": "d9870712ee118b0725bfaa92522a22c2076fc685"
+  "gitHead": "08e75f787367ce639b591f9e2f2402cfb8badfe6"
 }

package/src/init.js

@@ -3,8 +3,15 @@ const fetch = require('node-fetch');
 const path = require('path');
 const inquirer = require('inquirer');
 
-const { getRC3Url } = require('./auth');
-const { getcwd, exec, unzip, getAuthorNameFromToken, packageJsonKeys } = require('./utils');
+const { chooseMerchant, getRC3Url } = require('./auth');
+const {
+  getcwd,
+  exec,
+  unzip,
+  getAuthorNameFromToken,
+  packageJsonKeys,
+  getMerchantTemplatesVersion
+} = require('./utils');
 const { serve } = require('./serve');
 const { getValidSettings } = require('./select-merchant');
 
@@ -79,11 +86,14 @@ async function init(args) {
 
   let { token, merchant } = await getValidSettings(args);
 
-  const {
-    configs: msiConfigs,
-    meta_fields,
-    meta_fields_default
-  } = await getConfigs(args, SUBSCRIPTION_MANAGEMENT_ENDPOINT, merchant, token);
+  const { configs: msiConfigs, meta_fields } = await getConfigs(
+    args,
+    SUBSCRIPTION_MANAGEMENT_ENDPOINT,
+    merchant,
+    token
+  );
+
+  let smiVersion = meta_fields?.dependencies['@ordergroove/smi-core'] || 'latest';
 
   const { useMerchantSpecific } = args.yes
     ? { useMerchantSpecific: true }
@@ -99,7 +109,7 @@ async function init(args) {
         }
       ]);
 
-  let smiVersion, smiTemplateVersion;
+  let smiTemplateVersion;
 
   if (useMerchantSpecific && msiConfigs.smi && msiConfigs.smi.files) {
     if (msiConfigs.provisioned_with && SMI_TEMPLATES_NAME in msiConfigs.provisioned_with) {
@@ -112,24 +122,23 @@ async function init(args) {
       fs.writeFileSync(filepath, content, { encoding: 'utf8' });
     });
 
-    if (!meta_fields_default) {
-      smiVersion = (meta_fields.dependencies || {})[SMI_CORE_NAME];
-    }
-
     console.log('Templates initialized');
   } else {
     console.log('Configs not found, defaulting to latest.');
-    ({ version: smiTemplateVersion } = await (
-      await fetch('https://static.ordergroove.com/@ordergroove/smi-templates/latest/package.json')
-    ).json());
-    await downloadAndExtract('https://static.ordergroove.com/@ordergroove/smi-templates/latest/dist/smi-template.zip');
+
+    smiTemplateVersion = await getMerchantTemplatesVersion(smiVersion);
+
+    await downloadAndExtract(
+      `https://static.ordergroove.com/@ordergroove/smi-templates/${smiTemplateVersion}/dist/smi-template.zip`
+    );
   }
+
+  console.log(`Using templates version ${smiTemplateVersion}`);
+
   if (!smiVersion) {
     smiVersion = 'latest';
   }
 
-  console.log(`Using templates version ${smiTemplateVersion}`);
-
   // skip this for now
   const installEntrypoint = args.entrypoint;
 

package/src/utils.js

@@ -4,7 +4,9 @@ const util = require('util');
 const path = require('path');
 const { spawn } = require('child_process');
 const ora = require('ora');
+const semver = require('semver');
 const AdmZip = require('adm-zip');
+const fetch = require('node-fetch');
 
 exports.glob = util.promisify(require('glob'));
 
@@ -173,6 +175,27 @@ function getAuthorNameFromToken(rawToken) {
 
 exports.getAuthorNameFromToken = getAuthorNameFromToken;
 
+async function getMerchantTemplatesVersion(coreVersion) {
+  let templatesDevDependencies;
+  const coreJson = `https://static.ordergroove.com/@ordergroove/smi-core/${coreVersion}/package.json`;
+  const response = await fetch(coreJson);
+
+  if (response.ok) {
+    const registryJson = await response.json();
+    templatesDevDependencies = registryJson.devDependencies['@ordergroove/smi-templates'];
+  }
+
+  if (templatesDevDependencies) {
+    return semver.minVersion(templatesDevDependencies).raw;
+  } else {
+    const response = await fetch('https://static.ordergroove.com/@ordergroove/smi-templates/latest/package.json');
+    const json = await response.json();
+    return json.version;
+  }
+}
+
+exports.getMerchantTemplatesVersion = getMerchantTemplatesVersion;
+
 exports.packageJsonKeys = {
   OG_SECTION: 'ordergroove',
   CORE_VERSION: 'coreVersion',