Merge pull request #246 from Esri/at/adlib-comes-to-hub.js

interpolate function

packages/common/package.json

@@ -14,6 +14,7 @@
     "dist/**"
   ],
   "dependencies": {
+    "adlib": "3.0.5",
     "fetch-blob": "github:node-fetch/fetch-blob#master",
     "node-fetch": "^2.6.0",
     "tslib": "^1.11.1"
@@ -22,15 +23,13 @@
     "@esri/arcgis-rest-auth": "^2.0.0",
     "@esri/arcgis-rest-portal": "^2.0.0",
     "@esri/arcgis-rest-request": "^2.0.0",
-    "@esri/arcgis-rest-types": "^2.0.0",
-    "adlib": "^3.0.3"
+    "@esri/arcgis-rest-types": "^2.0.0"
   },
   "devDependencies": {
     "@esri/arcgis-rest-auth": "^2.0.0",
     "@esri/arcgis-rest-portal": "^2.0.0",
     "@esri/arcgis-rest-request": "^2.0.0",
-    "@esri/arcgis-rest-types": "^2.0.0",
-    "adlib": "^3.0.4"
+    "@esri/arcgis-rest-types": "^2.0.0"
   },
   "scripts": {
     "prepare": "npm run build",

packages/common/src/items/index.ts

@@ -3,6 +3,7 @@ export * from "./delete-prop";
 export * from "./fail-safe-update";
 export * from "./get-model";
 export * from "./get-model-from-options";
+export * from "./interpolate";
 export * from "./interpolate-item-id";
 export * from "./normalize-solution-template-item";
 export * from "./replace-item-id";

packages/common/src/items/interpolate-item-id.ts

@@ -1,5 +1,5 @@
 import { IModelTemplate } from "../types";
-import { adlib } from "adlib";
+import { interpolate } from "./interpolate";
 
 /**
  * Interpolate the item id back into any  {{appid}} instances
@@ -15,5 +15,5 @@ export function interpolateItemId(
       return v;
     }
   };
-  return adlib(model, settings, transforms);
+  return interpolate(model, settings, transforms);
 }

packages/common/src/items/interpolate.ts

@@ -0,0 +1,11 @@
+import { adlib } from "adlib";
+
+/**
+ * Interpolates handlebars-style placeholders on an object graph
+ * @param template
+ * @param settings
+ * @param transforms
+ */
+export function interpolate(template: any, settings: any, transforms?: any) {
+  return adlib(template, settings, transforms);
+}

packages/common/test/items/interpolate.test.ts

@@ -0,0 +1,14 @@
+import * as adlibModule from "adlib";
+import { interpolate } from "../../src";
+
+describe("interpolate", function() {
+  it("calls adlib", function() {
+    spyOn(adlibModule, "adlib");
+
+    const args = [{ id: "template" }, { id: "settings" }, { id: "transforms" }];
+
+    interpolate(args[0], args[1], args[2]);
+
+    expect(adlibModule.adlib).toHaveBeenCalledWith(...args);
+  });
+});