@netlify/zip-it-and-ship-it 5.10.2 → 6.0.0-beta

package/dist/feature_flags.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFlags = exports.defaultFlags = void 0;
 const process_1 = require("process");
 exports.defaultFlags = {
-    buildGoSource: Boolean(process_1.env.NETLIFY_EXPERIMENTAL_BUILD_GO_SOURCE),
     buildRustSource: Boolean(process_1.env.NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE),
     parseWithEsbuild: false,
     traceWithNft: false,
-    zisi_detect_esm: false,
     zisi_pure_esm: false,
+    zisi_functions_api_v2: false,
 };
 // List of supported flags and their default value.
 const getFlags = (input = {}, flags = exports.defaultFlags) => Object.entries(flags).reduce((result, [key, defaultValue]) => ({

package/dist/runtimes/go/builder.js

@@ -12,6 +12,7 @@ const build = async ({ destPath, mainFile, srcDir }) => {
             env: {
                 CGO_ENABLED: '0',
                 GOOS: 'linux',
+                GOARCH: 'amd64',
             },
         });
     }

package/dist/runtimes/go/index.js

@@ -29,14 +29,11 @@ const findFunctionsInPaths = async function ({ featureFlags, fsCache, paths }) {
     const functions = await Promise.all(paths.map((path) => findFunctionInPath({ featureFlags, fsCache, path })));
     return functions.filter(non_nullable_js_1.nonNullable);
 };
-const findFunctionInPath = async function ({ featureFlags, fsCache, path }) {
+const findFunctionInPath = async function ({ fsCache, path }) {
     const runtime = await (0, detect_runtime_js_1.detectBinaryRuntime)({ fsCache, path });
     if (runtime === 'go') {
         return processBinary({ fsCache, path });
     }
-    if (featureFlags.buildGoSource !== true) {
-        return;
-    }
     const goSourceFile = await detectGoFunction({ fsCache, path });
     if (goSourceFile) {
         return processSource({ fsCache, mainFile: goSourceFile, path });

package/dist/runtimes/node/bundlers/index.js

@@ -31,13 +31,8 @@ const getDefaultBundler = async ({ extension, mainFile, featureFlags, }) => {
     if (featureFlags.traceWithNft) {
         return 'nft';
     }
-    if (featureFlags.zisi_detect_esm) {
-        const functionIsESM = await (0, detect_es_module_js_1.detectEsModule)({ mainFile });
-        if (functionIsESM) {
-            return 'nft';
-        }
-    }
-    return 'zisi';
+    const functionIsESM = await (0, detect_es_module_js_1.detectEsModule)({ mainFile });
+    return functionIsESM ? 'nft' : 'zisi';
 };
 exports.getDefaultBundler = getDefaultBundler;
 //# sourceMappingURL=index.js.map

package/dist/runtimes/node/in_source_config/index.js

@@ -17,6 +17,8 @@ const findISCDeclarationsInPath = async (sourcePath) => {
         return {};
     }
     const imports = ast.body.flatMap((node) => (0, imports_js_1.getImports)(node, exports.IN_SOURCE_CONFIG_MODULE));
+    const scheduledFuncsExpected = imports.filter(({ imported }) => imported === 'schedule').length;
+    let scheduledFuncsFound = 0;
     const getAllBindings = (0, bindings_js_1.createBindingsMethod)(ast.body);
     const mainExports = (0, exports_js_1.getMainExport)(ast.body, getAllBindings);
     const iscExports = mainExports
@@ -26,14 +28,22 @@ const findISCDeclarationsInPath = async (sourcePath) => {
             return null;
         }
         switch (matchingImport.imported) {
-            case 'schedule':
-                return (0, schedule_js_1.parse)({ args }, getAllBindings);
+            case 'schedule': {
+                const parsed = (0, schedule_js_1.parse)({ args }, getAllBindings);
+                if (parsed.schedule) {
+                    scheduledFuncsFound += 1;
+                }
+                return parsed;
+            }
             default:
             // no-op
         }
         return null;
     })
         .filter(non_nullable_js_1.nonNullable);
+    if (scheduledFuncsFound < scheduledFuncsExpected) {
+        throw new Error('Warning: unable to find cron expression for scheduled function. `schedule` imported but not called or exported. If you meant to schedule a function, please check that `schedule` is invoked with an appropriate cron expression.');
+    }
     const mergedExports = iscExports.reduce((acc, obj) => ({ ...acc, ...obj }), {});
     return mergedExports;
 };

package/dist/runtimes/node/index.js

@@ -58,6 +58,7 @@ const zipFunction = async function ({ archiveFormat, basePath, config = {}, dest
         basePath: finalBasePath,
         destFolder,
         extension,
+        featureFlags,
         filename,
         mainFile: finalMainFile,
         moduleFormat,

package/dist/runtimes/node/runtime_api/index.d.ts

@@ -0,0 +1,3 @@
+import type { ModuleFormat } from '../utils/module_format.js';
+declare const getRuntimeLayer: (importPath: string, format: ModuleFormat) => Promise<string>;
+export { getRuntimeLayer };

package/dist/runtimes/node/runtime_api/index.js

@@ -0,0 +1,46 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRuntimeLayer = void 0;
+const fs_1 = require("fs");
+const esbuild_1 = require("@netlify/esbuild");
+const del_1 = __importDefault(require("del"));
+const tmp_promise_1 = require("tmp-promise");
+const getCompatCode = (importPath, format) => {
+    const compatPath = require.resolve('@netlify/functions');
+    if (format === 'cjs') {
+        return `
+      const { getHandler } = require('${compatPath}')
+      const func = require('${importPath}')
+      
+      module.exports.handler = getHandler(func)
+    `;
+    }
+    return `
+    import { getHandler } from '${compatPath}'
+    import * as func from '${importPath}'
+
+    export const handler = getHandler(func)
+  `;
+};
+const getRuntimeLayer = async (importPath, format) => {
+    const postfix = format === 'esm' ? '.mjs' : '.js';
+    const tmpPath = await (0, tmp_promise_1.tmpName)({ postfix });
+    const contents = getCompatCode(importPath, format);
+    await fs_1.promises.writeFile(tmpPath, contents);
+    const { outputFiles } = await (0, esbuild_1.build)({
+        bundle: true,
+        entryPoints: [tmpPath],
+        external: [importPath],
+        format,
+        logLevel: 'warning',
+        platform: 'node',
+        write: false,
+    });
+    await (0, del_1.default)(tmpPath, { force: true });
+    return outputFiles[0].text;
+};
+exports.getRuntimeLayer = getRuntimeLayer;
+//# sourceMappingURL=index.js.map

package/dist/runtimes/node/utils/detect_native_module.js

@@ -11,7 +11,10 @@ const isNativeModule = ({ binary, dependencies = {}, devDependencies = {}, files
     if (hasMarkerModule) {
         return true;
     }
-    const hasBinaryFile = files.some((path) => !path.startsWith('!') && (0, path_1.extname)(path) === '.node');
+    // Check if files is an array, as we never know (see https://github.com/math-utils/hamming-distance/pull/4)
+    const hasBinaryFile = Array.isArray(files)
+        ? files.some((path) => !path.startsWith('!') && (0, path_1.extname)(path) === '.node')
+        : false;
     return hasBinaryFile;
 };
 exports.isNativeModule = isNativeModule;

package/dist/runtimes/node/utils/entry_file.d.ts

@@ -1,12 +1,14 @@
+import { FeatureFlags } from '../../../feature_flags.js';
 import type { ModuleFormat } from './module_format.js';
 export interface EntryFile {
     contents: string;
     filename: string;
 }
-export declare const getEntryFile: ({ commonPrefix, filename, mainFile, moduleFormat, userNamespace, }: {
+export declare const getEntryFile: ({ commonPrefix, featureFlags, filename, mainFile, moduleFormat, userNamespace, }: {
     commonPrefix: string;
+    featureFlags: FeatureFlags;
     filename: string;
     mainFile: string;
     moduleFormat: ModuleFormat;
     userNamespace: string;
-}) => EntryFile;
+}) => Promise<EntryFile>;

package/dist/runtimes/node/utils/entry_file.js

@@ -2,19 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEntryFile = void 0;
 const path_1 = require("path");
+const index_js_1 = require("../runtime_api/index.js");
 const normalize_path_js_1 = require("./normalize_path.js");
-const getEntryFileContents = (mainPath, moduleFormat) => {
-    const importPath = `.${mainPath.startsWith('/') ? mainPath : `/${mainPath}`}`;
+const getEntryFileContents = (importPath, moduleFormat) => {
     if (moduleFormat === 'cjs') {
         return `module.exports = require('${importPath}')`;
     }
     return `export { handler } from '${importPath}'`;
 };
-const getEntryFile = ({ commonPrefix, filename, mainFile, moduleFormat, userNamespace, }) => {
+const getImportPath = (modulePath) => `.${modulePath.startsWith('/') ? modulePath : `/${modulePath}`}`;
+const getEntryFile = async ({ commonPrefix, featureFlags, filename, mainFile, moduleFormat, userNamespace, }) => {
     const mainPath = (0, normalize_path_js_1.normalizeFilePath)({ commonPrefix, path: mainFile, userNamespace });
     const extension = (0, path_1.extname)(filename);
     const entryFilename = `${(0, path_1.basename)(filename, extension)}.js`;
-    const contents = getEntryFileContents(mainPath, moduleFormat);
+    const importPath = getImportPath(mainPath);
+    const contents = featureFlags.zisi_functions_api_v2
+        ? await (0, index_js_1.getRuntimeLayer)(importPath, moduleFormat)
+        : getEntryFileContents(importPath, moduleFormat);
     return {
         contents,
         filename: entryFilename,

package/dist/runtimes/node/utils/zip.d.ts

@@ -1,3 +1,4 @@
+import { FeatureFlags } from '../../../feature_flags.js';
 import type { ModuleFormat } from './module_format.js';
 export declare type ArchiveFormat = 'none' | 'zip';
 interface ZipNodeParameters {
@@ -5,6 +6,7 @@ interface ZipNodeParameters {
     basePath: string;
     destFolder: string;
     extension: string;
+    featureFlags: FeatureFlags;
     filename: string;
     mainFile: string;
     moduleFormat: ModuleFormat;

package/dist/runtimes/node/utils/zip.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zipNodeJs = void 0;
+/* eslint-disable max-lines */
 const buffer_1 = require("buffer");
 const fs_1 = require("fs");
 const os_1 = __importDefault(require("os"));
@@ -20,9 +21,10 @@ const COPY_FILE_CONCURRENCY = os_1.default.cpus().length === 0 ? 2 : os_1.defaul
 // Sub-directory to place all user-defined files  (i.e. everything other than
 // the entry file generated by zip-it-and-ship-it).
 const DEFAULT_USER_SUBDIRECTORY = 'src';
-const createDirectory = async function ({ aliases = new Map(), basePath, destFolder, extension, filename, mainFile, moduleFormat, rewrites = new Map(), srcFiles, }) {
-    const { contents: entryContents, filename: entryFilename } = (0, entry_file_js_1.getEntryFile)({
+const createDirectory = async function ({ aliases = new Map(), basePath, destFolder, extension, featureFlags, filename, mainFile, moduleFormat, rewrites = new Map(), srcFiles, }) {
+    const { contents: entryContents, filename: entryFilename } = await (0, entry_file_js_1.getEntryFile)({
         commonPrefix: basePath,
+        featureFlags,
         filename,
         mainFile,
         moduleFormat,
@@ -50,7 +52,7 @@ const createDirectory = async function ({ aliases = new Map(), basePath, destFol
     }, { concurrency: COPY_FILE_CONCURRENCY });
     return functionFolder;
 };
-const createZipArchive = async function ({ aliases, basePath, destFolder, extension, filename, mainFile, moduleFormat, rewrites, srcFiles, }) {
+const createZipArchive = async function ({ aliases, basePath, destFolder, extension, featureFlags, filename, mainFile, moduleFormat, rewrites, srcFiles, }) {
     const destPath = (0, path_1.join)(destFolder, `${(0, path_1.basename)(filename, extension)}.zip`);
     const { archive, output } = (0, archive_js_1.startZip)(destPath);
     const entryFilename = `${(0, path_1.basename)(filename, extension)}.js`;
@@ -66,7 +68,14 @@ const createZipArchive = async function ({ aliases, basePath, destFolder, extens
     // than the entry file) to its own sub-directory.
     const userNamespace = hasEntryFileConflict ? DEFAULT_USER_SUBDIRECTORY : '';
     if (needsEntryFile) {
-        const entryFile = (0, entry_file_js_1.getEntryFile)({ commonPrefix: basePath, filename, mainFile, moduleFormat, userNamespace });
+        const entryFile = await (0, entry_file_js_1.getEntryFile)({
+            commonPrefix: basePath,
+            featureFlags,
+            filename,
+            mainFile,
+            moduleFormat,
+            userNamespace,
+        });
         addEntryFileToZip(archive, entryFile);
     }
     const srcFilesInfos = await Promise.all(srcFiles.map(addStat));
@@ -111,4 +120,5 @@ const zipJsFile = function ({ aliases = new Map(), archive, commonPrefix, rewrit
         (0, archive_js_1.addZipFile)(archive, srcFile, normalizedDestPath, stat);
     }
 };
+/* eslint-enable max-lines */
 //# sourceMappingURL=zip.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "5.10.2",
+  "version": "6.0.0-beta",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "bin": {
@@ -54,6 +54,7 @@
   "dependencies": {
     "@babel/parser": "7.16.8",
     "@netlify/esbuild": "0.14.25",
+    "@netlify/functions": "^2.0.0-beta",
     "@vercel/nft": "^0.20.0",
     "archiver": "^5.3.0",
     "common-path-prefix": "^3.0.0",