@nakedcreativity/cee-ms-node 1.0.122 → 2.0.0-beta.1

package/package.json

@@ -1,40 +1,39 @@
 {
   "name": "@nakedcreativity/cee-ms-node",
-  "version": "1.0.122",
-  "description": "Cee.ms for Node.js",
+  "version": "2.0.0-beta.1",
+  "description": "Cee.ms for Node.js: renders Cee.ms sites from their published JSON with Liquid templates",
   "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
+  "engines": {
+    "node": ">=22"
+  },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc",
-    "format": "prettier --write \"src/**/*.ts\"",
-    "lint": "tslint -p tsconfig.json",
-    "start": "PORT=3030 nodemon lib/test.js localhost 3030",
-    "api": "sam local start-api --region eu-west-2 --warm-containers eager 2>&1 | tr \"\r\" \"\n\"",
-    "prepare": "npm version patch"
+    "build": "tsc -p tsconfig.build.json",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "test": "vitest run",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "dev": "tsx watch dev/server.ts",
+    "prepublishOnly": "npm run typecheck && npm test && npm run build"
   },
   "author": "Naked Creativity",
   "license": "ISC",
   "dependencies": {
-    "@vendia/serverless-express": "^4.3.8",
-    "aws-lambda": "^1.0.6",
-    "aws-sdk": "^2.922.0",
-    "cheerio": "0.22.0",
-    "express": "^4.14.0",
-    "liquidjs": "^10.12.0",
-    "slugify": "^1.6.0",
-    "underscore": "^1.13.1"
+    "@aws-sdk/client-s3": "^3.1156.0",
+    "cheerio": "^1.2.0",
+    "express": "^4.22.3",
+    "liquidjs": "^10.30.0",
+    "slugify": "^1.6.6"
   },
   "devDependencies": {
-    "@types/express": "github:types/npm-express",
-    "@types/node": "^15.0.2",
-    "nodemon": "^2.0.7",
-    "prettier": "^2.3.0",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0",
-    "typescript": "^4.2.4"
+    "@types/express": "^4.17.25",
+    "@types/node": "^22.19.0",
+    "@vendia/serverless-express": "^4.12.6",
+    "prettier": "^3.9.10",
+    "tsx": "^4.23.15",
+    "typescript": "~5.9.3",
+    "vitest": "^5.0.5"
   },
   "files": [
     "lib/**/*"
-  ],
-  "types": "./lib/index.d.ts"
+  ]
 }

package/lib/test-tags.d.ts

@@ -1,3 +0,0 @@
-import { LiquidTag } from './interfaces';
-export declare const InvestorTag: LiquidTag;
-export declare const CardsTag: LiquidTag;

package/lib/test-tags.js

@@ -1,125 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CardsTag = exports.InvestorTag = void 0;
-const fs_1 = __importDefault(require("fs"));
-const underscore_1 = __importDefault(require("underscore"));
-exports.InvestorTag = {
-    name: 'investors',
-    register: (engine) => {
-        return {
-            parse: function (tagToken, remainTokens) {
-                this.match = tagToken.args.split(' '); // name // path[0] == navigation name\
-            },
-            render: function (context, hash) {
-                console.log('investors module');
-                if (context.globals['collections'] && context.globals['collections']['investor-updates']) {
-                    var collection = JSON.parse(fs_1.default.readFileSync('./test-data/data/' + context.globals['collections']['investor-updates']._id + '.json', 'utf8'));
-                    // loop through the collection and filter out based on the tag
-                    //console.log('tag', scope.scopes[0].tag)
-                    var financialYears = {
-                        '2022-23': [],
-                        '2021-22': [],
-                        '2020-21': [],
-                        '2019-20': [],
-                        '2018-19': [],
-                        '2017-18': [],
-                        '2016-17': [],
-                        '2015-16': [],
-                        '2014-15': [],
-                        '2013-14': [],
-                        '2012-13': [],
-                        '2011-12': [],
-                    };
-                    var outputCollectionArray = [];
-                    collection.data.forEach((document) => {
-                        if (financialYears[document.text]) {
-                            financialYears[document.text].push(document);
-                        }
-                    });
-                    underscore_1.default.each(financialYears, (year, key) => {
-                        if (year.length > 0) {
-                            var updates = year.sort((a, b) => (a.date > b.date ? -1 : 1));
-                            outputCollectionArray.push({
-                                year: key,
-                                updates: updates,
-                            });
-                        }
-                    });
-                }
-                context.push({
-                    years: outputCollectionArray,
-                });
-                return engine
-                    .renderFile('investor-updates-snippet.liquid', context.getAll())
-                    .then((html) => {
-                    context.pop();
-                    return html;
-                })
-                    .catch((error) => {
-                    return '';
-                });
-            },
-        };
-    },
-};
-//   export const InvestorTag:LiquidTag = {
-//     name: 'investors',
-//     register: (engine) => {
-//         return {
-exports.CardsTag = {
-    name: 'cards',
-    register: (engine) => {
-        return {
-            parse: function (tagToken, remainTokens) {
-                this.match = tagToken.args.split(' '); // name // path[0] == navigation name\
-                // this.match[0] = tag
-                // this.match[0] = template
-            },
-            render: function (context, hash) {
-                console.log('cards module');
-                this.collectionName = engine.evalValueSync(this.match[0], context);
-                if (context.globals['collections'] && context.globals['collections'][this.collectionName]) {
-                    var collection = JSON.parse(fs_1.default.readFileSync('./test-data/data/' + context.globals['collections'][this.collectionName]._id + '.json', 'utf8'));
-                    //console.log("collection in cards tag", collection);
-                    var category;
-                    var cardsArray = [];
-                    var i = 0;
-                    // order by category
-                    collection.data = underscore_1.default.sortBy(collection.data, ['title']);
-                    collection.data.forEach((data) => {
-                        if (data.title != category) {
-                            var obj = {
-                                category: data.title,
-                                links: [],
-                            };
-                            cardsArray.push(obj);
-                            category = data.title;
-                            i = i + 1;
-                        }
-                        cardsArray[i - 1].links.push(data);
-                    });
-                }
-                //console.log(cardsArray, 'cards');
-                context.push({ cardCategories: cardsArray });
-                return (engine
-                    .renderFile(this.match[1] + '.liquid', context.getAll())
-                    // .then((templates) => {
-                    //   return engine.renderer.renderTemplates(templates, scope);
-                    // })
-                    .then((html) => {
-                    context.pop();
-                    return html;
-                })
-                    .catch((error) => {
-                    console.log('error in site_page_data');
-                    console.log(error);
-                    return '';
-                }));
-            },
-        };
-    },
-};
-//# sourceMappingURL=test-tags.js.map

package/lib/test-tags.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"test-tags.js","sourceRoot":"","sources":["../src/test-tags.ts"],"names":[],"mappings":"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"}

package/lib/test.d.ts

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

package/lib/test.js

@@ -1,52 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("./index");
-const interfaces_1 = require("./interfaces");
-const serverless_express_1 = __importDefault(require("@vendia/serverless-express"));
-const aws_sdk_1 = __importDefault(require("aws-sdk"));
-const test_tags_1 = require("./test-tags");
-aws_sdk_1.default.config.loadFromPath('./test-data/aws-credentials.json');
-let ceems = new index_1.Ceems({
-    assets: 'assets',
-    cacheSource: interfaces_1.CacheSource.S3,
-    cacheBucket: 'needlemakers',
-    customHandler: true,
-    cacheFolder: '',
-    viewsPath: './test-data/views/',
-    tags: [test_tags_1.InvestorTag, test_tags_1.CardsTag],
-});
-exports.handler = serverless_express_1.default({ app: ceems.app });
-let metadata = {
-    twitter: 'WCNeedlemakers'
-};
-ceems.app.get(/(.*)/, async (req, res, next) => {
-    console.log('get page', req._parsedUrl.path);
-    //@ts-ignore
-    res.set('Content-Type', 'text/html');
-    try {
-        let page = await ceems.load(req, res, true);
-        //  console.log('metadata',metadata)
-        //@ts-ignore
-        ceems.engine.options.globals.metadata = metadata;
-        ceems.render(page, req, res);
-    }
-    catch (error) {
-        console.log(error);
-        console.log('error loading', req._parsedUrl.path);
-        //@ts-ignore
-        res.sendStatus(404);
-    }
-    // fs.createReadStream('needles.html').pipe(res)
-});
-ceems.app.listen(3030, () => {
-    console.log('app listening');
-});
-// /products/{business-area}/{category-name}
-// /products/{business-area}/{category-name}/{product}
-// load the products data collection
-// find the product based upon the slug
-// build the 'page' object that replicates one of the cache file pages, populating modules with the content from the product data
-//# sourceMappingURL=test.js.map

package/lib/test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;;;;AAAA,mCAAgC;AAChC,6CAAwE;AAExE,oFAA2D;AAC3D,sDAAyB;AACzB,2CAAoD;AAEpD,iBAAG,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAkC,CAAC,CAAA;AAE3D,IAAI,KAAK,GAAG,IAAI,aAAK,CAAC;IAClB,MAAM,EAAE,QAAQ;IAChB,WAAW,EAAE,wBAAW,CAAC,EAAE;IAC3B,WAAW,EAAE,cAAc;IAC3B,aAAa,EAAE,IAAI;IACnB,WAAW,EAAE,EAAE;IACf,SAAS,EAAE,oBAAoB;IAC/B,IAAI,EAAE,CAAC,uBAAW,EAAE,oBAAQ,CAAC;CAChC,CAAC,CAAC;AAEH,OAAO,CAAC,OAAO,GAAG,4BAAiB,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;AAExD,IAAI,QAAQ,GAAG;IACX,OAAO,EAAE,gBAAgB;CAC1B,CAAA;AAIH,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,GAAiB,EAAE,GAAkB,EAAE,IAAQ,EAAC,EAAE;IAC3E,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;IAE5C,YAAY;IACZ,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,CAAA;IAEpC,IAAI;QACF,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;QAC3C,oCAAoC;QACpC,YAAY;QACZ,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAChD,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;KAC7B;IAAA,OAAM,KAAK,EAAC;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAClB,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACjD,YAAY;QACZ,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;KACpB;IAED,gDAAgD;AAElD,CAAC,CAAC,CAAA;AAEJ,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;IACxB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC,CAAC,CAAC;AAKH,4CAA4C;AAE5C,sDAAsD;AACtD,oCAAoC;AACpC,uCAAuC;AAEvC,iIAAiI"}