openapi-sync 1.0.11 → 1.0.13

package/bin/cli.js

@@ -1,3 +1,20 @@
 #!/usr/bin/env node
 
-require("../dist/index");
+const OpenApisync = require("../dist/index");
+
+const yargs = require("yargs/yargs");
+const { hideBin } = require("yargs/helpers");
+
+// Setup yargs
+const argv = yargs(hideBin(process.argv))
+  .option("refreshinterval", {
+    alias: "ri",
+    type: "number",
+    description: "Interval at which to refretch specifiations",
+  })
+  .help().argv;
+
+// Use the flags
+OpenApisync.Init({
+  refetchInterval: argv.refreshinterval,
+});

package/db.json

@@ -0,0 +1 @@
+{}

package/dist/Openapi-sync/index.js

@@ -21,10 +21,10 @@ const axios_retry_1 = __importDefault(require("axios-retry"));
 const openapi_core_1 = require("@redocly/openapi-core");
 const state_1 = require("./state");
 const rootUsingCwd = process.cwd();
-let fetchTimeout = null;
+let fetchTimeout = {};
 // Create an Axios instance
 const apiClient = axios_1.default.create({
-    timeout: 30000, // Timeout after 30 seconds
+    timeout: 60000, // Timeout after 1min
 });
 // Configure axios-retry
 (0, axios_retry_1.default)(apiClient, {
@@ -37,7 +37,7 @@ const apiClient = axios_1.default.create({
         return retryCount * 1000; // Exponential back-off: 1s, 2s, 3s, etc.
     },
 });
-const OpenapiSync = (apiUrl, apiName) => __awaiter(void 0, void 0, void 0, function* () {
+const OpenapiSync = (apiUrl, apiName, refetchInterval) => __awaiter(void 0, void 0, void 0, function* () {
     const specResponse = yield apiClient.get(apiUrl);
     const redoclyConfig = yield (0, openapi_core_1.createConfig)({
         extends: ["minimal"],
@@ -54,21 +54,21 @@ const OpenapiSync = (apiUrl, apiName) => __awaiter(void 0, void 0, void 0, funct
     const folderPath = path_1.default.join(config.folder || "", apiName);
     const spec = lintResults.bundle.parsed;
     // auto update only on dev
-    if (!(process.env.NODE_ENV &&
-        ["production", "prod", "test", "staging"].includes(process.env.NODE_ENV))) {
-        // compare new spec with old spec, continuing only if spec it different
-        // auto sync at interval
-        if (fetchTimeout)
-            clearTimeout(fetchTimeout);
-        if (!isNaN(config.refetchInterval) && config.refetchInterval) {
-            // use config interval or 1 hour
-            fetchTimeout = setTimeout(() => OpenapiSync(apiUrl, apiName), config.refetchInterval || 60000);
+    if (refetchInterval && !isNaN(refetchInterval) && refetchInterval > 0) {
+        if (!(process.env.NODE_ENV &&
+            ["production", "prod", "test", "staging"].includes(process.env.NODE_ENV))) {
+            // auto sync at interval
+            if (fetchTimeout[apiName])
+                clearTimeout(fetchTimeout[apiName]);
+            // set next request timeout
+            fetchTimeout[apiName] = setTimeout(() => OpenapiSync(apiUrl, apiName, refetchInterval), refetchInterval);
         }
-        const prevSpec = (0, state_1.getState)(apiName);
-        if ((0, lodash_1.isEqual)(prevSpec, spec))
-            return;
-        (0, state_1.setState)(apiName, spec);
     }
+    // compare new spec with old spec, continuing only if spec it different
+    const prevSpec = (0, state_1.getState)(apiName);
+    if ((0, lodash_1.isEqual)(prevSpec, spec))
+        return;
+    (0, state_1.setState)(apiName, spec);
     let endpointsFileContent = "";
     let typesFileContent = "";
     let sharedTypesFileContent = "";
@@ -97,6 +97,21 @@ const OpenapiSync = (apiUrl, apiName) => __awaiter(void 0, void 0, void 0, funct
         }
         return typeCnt;
     };
+    const treatEndpointUrl = (endpointUrl) => {
+        var _a, _b;
+        if (((_b = (_a = config === null || config === void 0 ? void 0 : config.endpoints) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _b.replaceWords) &&
+            Array.isArray(config.endpoints.value.replaceWords)) {
+            let newEndpointUrl = endpointUrl;
+            config.endpoints.value.replaceWords.forEach((replaceWord, indx) => {
+                const regexp = new RegExp(replaceWord.replace, "g");
+                newEndpointUrl = newEndpointUrl.replace(regexp, replaceWord.with || "");
+            });
+            return newEndpointUrl;
+        }
+        else {
+            return endpointUrl;
+        }
+    };
     Object.keys(spec.paths || {}).forEach((endpointPath) => {
         const endpointSpec = spec.paths[endpointPath];
         const endpointMethods = Object.keys(endpointSpec);
@@ -118,6 +133,8 @@ const OpenapiSync = (apiUrl, apiName) => __awaiter(void 0, void 0, void 0, funct
                 const params = endpoint.variables.map((v) => `${v}:string`).join(",");
                 endpointUrl = `(${params})=> \`${endpointUrlTxt}\``;
             }
+            //treat endpoint url
+            endpointUrl = treatEndpointUrl(endpointUrl);
             // Add the endpoint url
             endpointsFileContent += `export const ${endpoint.name} = ${endpointUrl}; 
 `;

package/dist/Openapi-sync/state.js

@@ -1,9 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resetState = exports.getState = exports.setState = void 0;
-let state = {};
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const dbPath = path_1.default.join(__dirname, "../", "../db.json");
+let state = require(dbPath);
+const updateDB = (data) => {
+    fs_1.default.writeFileSync(dbPath, JSON.stringify(data));
+};
 const setState = (key, value) => {
     state[key] = value;
+    updateDB(state);
 };
 exports.setState = setState;
 const getState = (key) => {
@@ -12,5 +22,6 @@ const getState = (key) => {
 exports.getState = getState;
 const resetState = () => {
     state = {};
+    updateDB(state);
 };
 exports.resetState = resetState;

package/dist/index.js

@@ -12,21 +12,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Init = void 0;
 const Openapi_sync_1 = __importDefault(require("./Openapi-sync"));
 const dotenv_1 = __importDefault(require("dotenv"));
 const path_1 = __importDefault(require("path"));
 const state_1 = require("./Openapi-sync/state");
 dotenv_1.default.config();
 const rootUsingCwd = process.cwd();
-const Init = () => __awaiter(void 0, void 0, void 0, function* () {
+const Init = (options) => __awaiter(void 0, void 0, void 0, function* () {
     // Load config file
     const config = require(path_1.default.join(rootUsingCwd, "openapi.sync.json"));
     const apiNames = Object.keys(config.api);
+    const refetchInterval = options &&
+        "refetchInterval" in options &&
+        !isNaN(options === null || options === void 0 ? void 0 : options.refetchInterval)
+        ? options.refetchInterval
+        : config.refetchInterval;
     (0, state_1.resetState)();
     for (let i = 0; i < apiNames.length; i += 1) {
         const apiName = apiNames[i];
         const apiUrl = config.api[apiName];
-        (0, Openapi_sync_1.default)(apiUrl, apiName);
+        (0, Openapi_sync_1.default)(apiUrl, apiName, refetchInterval);
     }
 });
-Init();
+exports.Init = Init;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-sync",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "sync openapi variables",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,6 +23,7 @@
   "files": [
     "bin",
     "dist",
+    "db.json",
     "LICENSE",
     "README.md",
     "package.json"
@@ -31,7 +32,7 @@
     "test": "echo \"Error: no test specified\"",
     "build": "tsc",
     "publish-package": "npm run build && npm version patch &&  npm publish",
-    "start": "ts-node index.ts"
+    "start": "npm run build && openapi-sync"
   },
   "author": "P-Technologies",
   "license": "ISC",
@@ -39,7 +40,6 @@
     "@types/js-yaml": "^4.0.9",
     "@types/lodash": "^4.17.7",
     "@types/node": "^22.1.0",
-    "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   },
   "dependencies": {
@@ -48,6 +48,7 @@
     "axios-retry": "^4.5.0",
     "dotenv": "^16.4.5",
     "js-yaml": "^4.1.0",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "yargs": "^17.7.2"
   }
 }