@takeshape/ssg 10.2.0 → 10.2.4

package/dist/config.js

@@ -98,14 +98,13 @@ function getGraphQLQueries(config) {
     routes
   } = config;
   const routeQueries = (0, _flatten.default)(Object.keys(routes).map(routeName => {
-    var _route$paginate;
     const route = routes[routeName];
     const results = route.context ? getContextGraphQLQueries(route.context, {
       routeName,
       path: route.path,
       isPaginated: false
     }) : [];
-    if ((_route$paginate = route.paginate) !== null && _route$paginate !== void 0 && _route$paginate.data) {
+    if (route.paginate?.data) {
       const filePath = isGraphQLQueryConfig(route.paginate.data) ? route.paginate.data.query : route.paginate.data;
       results.push({
         routeName,

package/dist/filters/create-number-filter.js

@@ -121,10 +121,10 @@ function createNumberFilter({
   return (value, formatStr, config) => {
     const localeSettings = {
       ...(locales[locale.toLowerCase()] || _enUS.default),
-      ...(numbers === null || numbers === void 0 ? void 0 : numbers.config),
+      ...numbers?.config,
       ...config
     };
-    const format = formatStr ? formatStr : numbers !== null && numbers !== void 0 && numbers.format ? numbers.format : ',';
+    const format = formatStr ? formatStr : numbers?.format ? numbers.format : ',';
     return (0, _d3Format.formatLocale)(localeSettings).format(format)(value);
   };
 }

package/dist/filters/create-route-filter.js

@@ -13,7 +13,7 @@ function createRouteFilter(config, stats) {
   return function (obj, routeName) {
     const route = (0, _get.default)(config.routes, routeName);
     let path;
-    if (route !== null && route !== void 0 && route.path) {
+    if (route?.path) {
       const pathResult = (0, _routing.formatPath)(route.path, obj);
       path = (0, _paths.joinPath)(config.pathPrefix, pathResult.path);
       if (pathResult.warnings.length) {

package/dist/generate/context.js

@@ -53,12 +53,11 @@ const getItemContext = (route, context, {
   previous,
   next
 }) => {
-  var _route$paginate;
   const itemContext = {
     item: current.item,
     currentPath: current.path
   };
-  if ((_route$paginate = route.paginate) !== null && _route$paginate !== void 0 && _route$paginate.itemName) {
+  if (route.paginate?.itemName) {
     itemContext[route.paginate.itemName] = current.item;
   }
   if (previous) {

package/dist/generate/generate.js

@@ -267,12 +267,11 @@ async function generateRoute(config, params) {
 }
 const identity = obj => obj;
 function getRenderTemplateDecorator(config) {
-  var _config$htmlCompressi;
   const decorators = [];
   if (config.gzip) {
     decorators.push(_gzip.default);
   }
-  if ((_config$htmlCompressi = config.htmlCompression) !== null && _config$htmlCompressi !== void 0 && _config$htmlCompressi.enabled) {
+  if (config.htmlCompression?.enabled) {
     decorators.push((0, _compressHtml.default)(config.htmlCompression));
   }
   return decorators.length ? (0, _compose.default)(decorators) : identity;

package/dist/graphql/migrate.js

@@ -68,8 +68,7 @@ function getMapResponse(props) {
       ...res.data
     };
     for (const prop of props) {
-      var _res$data;
-      if ((_res$data = res.data) !== null && _res$data !== void 0 && _res$data[prop]) {
+      if (res.data?.[prop]) {
         newRes.data[prop] = res.data[prop].items;
       }
     }

package/dist/graphql/pagination.js

@@ -44,7 +44,7 @@ function getPaginationStrategy(fieldDef) {
     const {
       args
     } = fieldDef;
-    if (args !== null && args !== void 0 && args.length) {
+    if (args?.length) {
       const keyedArgs = (0, _keyBy.default)(args, 'name');
       return paginationStrategies.find(strategy => {
         const {

package/dist/graphql/query.js

@@ -42,7 +42,7 @@ function ensureIds(queryAst, schema) {
         if (fieldDef) {
           const type = getItemType(fieldDef.type);
           const fields = getFields(type);
-          if (fields !== null && fields !== void 0 && fields._id) {
+          if (fields?._id) {
             return addId(node);
           }
         }
@@ -137,7 +137,7 @@ function withQueryTransforms(connector, schema, {
     if (usage) {
       queryAst = ensureIds(queryAst, schema);
     }
-    if (context !== null && context !== void 0 && context.isPaginated && contentId) {
+    if (context?.isPaginated && contentId) {
       const {
         ast,
         modified,

package/dist/graphql/schema-connector-factory.js

@@ -68,7 +68,6 @@ function schemaConnectorFactory(cwd, config) {
   if (config.type === 'graphql-js' && config.file) {
     const schema = require(_path.default.join(cwd, config.file)); // eslint-disable-line
     connector = async params => {
-      var _res$errors;
       const res = await (0, _graphql.graphql)({
         schema: schema.default || schema,
         source: params.query,
@@ -78,7 +77,7 @@ function schemaConnectorFactory(cwd, config) {
       });
       return {
         data: res.data,
-        errors: (_res$errors = res.errors) === null || _res$errors === void 0 ? void 0 : _res$errors.map(_graphql.formatError)
+        errors: res.errors?.map(_graphql.formatError)
       };
     };
   }

package/dist/resolve-context.js

@@ -20,7 +20,7 @@ var _config = require("./config");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function getType(path) {
   const matches = /\.(graphql|yml|yaml|json)$/.exec(path);
-  if (matches !== null && matches !== void 0 && matches.length) {
+  if (matches?.length) {
     const type = matches[1];
     return type === 'yml' ? 'yaml' : type;
   }
@@ -76,7 +76,7 @@ async function handleGraphQL({
     throw new _graphqlError.default(`An error occurred while resolving ${queryPath}`, res.errors);
   }
   const data = res.data;
-  if (route !== null && route !== void 0 && route.path && !route.paginate) {
+  if (route?.path && !route.paginate) {
     (0, _stats.recordContentUsage)(stats, data, route.path);
   }
   return data;

package/dist/stats.js

@@ -34,7 +34,7 @@ function scrapeIds(obj, depth = 1, result = []) {
   return result;
 }
 function recordContentUsage(stats, data, path) {
-  if (stats !== null && stats !== void 0 && stats.contentUsage) {
+  if (stats?.contentUsage) {
     const {
       contentUsage
     } = stats;

package/es/config.js

@@ -87,14 +87,13 @@ export function getGraphQLQueries(config) {
     routes
   } = config;
   const routeQueries = flatten(Object.keys(routes).map(routeName => {
-    var _route$paginate;
     const route = routes[routeName];
     const results = route.context ? getContextGraphQLQueries(route.context, {
       routeName,
       path: route.path,
       isPaginated: false
     }) : [];
-    if ((_route$paginate = route.paginate) !== null && _route$paginate !== void 0 && _route$paginate.data) {
+    if (route.paginate?.data) {
       const filePath = isGraphQLQueryConfig(route.paginate.data) ? route.paginate.data.query : route.paginate.data;
       results.push({
         routeName,

package/es/filters/create-number-filter.js

@@ -114,10 +114,10 @@ export default function createNumberFilter({
   return (value, formatStr, config) => {
     const localeSettings = {
       ...(locales[locale.toLowerCase()] || enUS),
-      ...(numbers === null || numbers === void 0 ? void 0 : numbers.config),
+      ...numbers?.config,
       ...config
     };
-    const format = formatStr ? formatStr : numbers !== null && numbers !== void 0 && numbers.format ? numbers.format : ',';
+    const format = formatStr ? formatStr : numbers?.format ? numbers.format : ',';
     return formatLocale(localeSettings).format(format)(value);
   };
 }

package/es/filters/create-route-filter.js

@@ -6,7 +6,7 @@ export default function createRouteFilter(config, stats) {
   return function (obj, routeName) {
     const route = get(config.routes, routeName);
     let path;
-    if (route !== null && route !== void 0 && route.path) {
+    if (route?.path) {
       const pathResult = formatPath(route.path, obj);
       path = joinPath(config.pathPrefix, pathResult.path);
       if (pathResult.warnings.length) {

package/es/generate/context.js

@@ -45,12 +45,11 @@ export const getItemContext = (route, context, {
   previous,
   next
 }) => {
-  var _route$paginate;
   const itemContext = {
     item: current.item,
     currentPath: current.path
   };
-  if ((_route$paginate = route.paginate) !== null && _route$paginate !== void 0 && _route$paginate.itemName) {
+  if (route.paginate?.itemName) {
     itemContext[route.paginate.itemName] = current.item;
   }
   if (previous) {

package/es/generate/generate.js

@@ -253,12 +253,11 @@ export async function generateRoute(config, params) {
 }
 const identity = obj => obj;
 function getRenderTemplateDecorator(config) {
-  var _config$htmlCompressi;
   const decorators = [];
   if (config.gzip) {
     decorators.push(gzipContents);
   }
-  if ((_config$htmlCompressi = config.htmlCompression) !== null && _config$htmlCompressi !== void 0 && _config$htmlCompressi.enabled) {
+  if (config.htmlCompression?.enabled) {
     decorators.push(compressHtml(config.htmlCompression));
   }
   return decorators.length ? compose(decorators) : identity;

package/es/graphql/migrate.js

@@ -59,8 +59,7 @@ export function getMapResponse(props) {
       ...res.data
     };
     for (const prop of props) {
-      var _res$data;
-      if ((_res$data = res.data) !== null && _res$data !== void 0 && _res$data[prop]) {
+      if (res.data?.[prop]) {
         newRes.data[prop] = res.data[prop].items;
       }
     }

package/es/graphql/pagination.js

@@ -30,7 +30,7 @@ function getPaginationStrategy(fieldDef) {
     const {
       args
     } = fieldDef;
-    if (args !== null && args !== void 0 && args.length) {
+    if (args?.length) {
       const keyedArgs = keyBy(args, 'name');
       return paginationStrategies.find(strategy => {
         const {

package/es/graphql/query.js

@@ -30,7 +30,7 @@ export function ensureIds(queryAst, schema) {
         if (fieldDef) {
           const type = getItemType(fieldDef.type);
           const fields = getFields(type);
-          if (fields !== null && fields !== void 0 && fields._id) {
+          if (fields?._id) {
             return addId(node);
           }
         }
@@ -124,7 +124,7 @@ export function withQueryTransforms(connector, schema, {
     if (usage) {
       queryAst = ensureIds(queryAst, schema);
     }
-    if (context !== null && context !== void 0 && context.isPaginated && contentId) {
+    if (context?.isPaginated && contentId) {
       const {
         ast,
         modified,

package/es/graphql/schema-connector-factory.js

@@ -60,7 +60,6 @@ export function schemaConnectorFactory(cwd, config) {
   if (config.type === 'graphql-js' && config.file) {
     const schema = require(path.join(cwd, config.file)); // eslint-disable-line
     connector = async params => {
-      var _res$errors;
       const res = await graphql({
         schema: schema.default || schema,
         source: params.query,
@@ -70,7 +69,7 @@ export function schemaConnectorFactory(cwd, config) {
       });
       return {
         data: res.data,
-        errors: (_res$errors = res.errors) === null || _res$errors === void 0 ? void 0 : _res$errors.map(formatError)
+        errors: res.errors?.map(formatError)
       };
     };
   }

package/es/resolve-context.js

@@ -7,7 +7,7 @@ import { recordContentUsage } from './stats';
 import { isGraphQLQueryConfig } from './config';
 export function getType(path) {
   const matches = /\.(graphql|yml|yaml|json)$/.exec(path);
-  if (matches !== null && matches !== void 0 && matches.length) {
+  if (matches?.length) {
     const type = matches[1];
     return type === 'yml' ? 'yaml' : type;
   }
@@ -63,7 +63,7 @@ export async function handleGraphQL({
     throw new GraphQLError(`An error occurred while resolving ${queryPath}`, res.errors);
   }
   const data = res.data;
-  if (route !== null && route !== void 0 && route.path && !route.paginate) {
+  if (route?.path && !route.paginate) {
     recordContentUsage(stats, data, route.path);
   }
   return data;

package/es/stats.js

@@ -26,7 +26,7 @@ export function scrapeIds(obj, depth = 1, result = []) {
   return result;
 }
 export function recordContentUsage(stats, data, path) {
-  if (stats !== null && stats !== void 0 && stats.contentUsage) {
+  if (stats?.contentUsage) {
     const {
       contentUsage
     } = stats;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/ssg",
-  "version": "10.2.0",
+  "version": "10.2.4",
   "description": "Static Site Generator",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -39,9 +39,9 @@
     "prismjs": "^1.22.0",
     "pumpify": "^2.0.1",
     "resolve": "^1.19.0",
-    "@takeshape/routing": "10.2.0",
-    "@takeshape/util": "10.2.0",
-    "@takeshape/streams": "10.2.0"
+    "@takeshape/routing": "10.2.4",
+    "@takeshape/util": "10.2.4",
+    "@takeshape/streams": "10.2.4"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.33",
@@ -57,10 +57,10 @@
     "@types/prismjs": "^1.16.2",
     "@types/pumpify": "^1.4.1",
     "graphql-type-json": "^0.3.2",
-    "@takeshape/typescript-jest-junit-reporter": "10.2.0"
+    "@takeshape/typescript-jest-junit-reporter": "10.2.4"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "scripts": {
     "build": "pnpm build:js && pnpm build:es && pnpm build:types && pnpm build:copy",