@sasjs/cli 3.6.5 → 3.7.1

package/build/commands/testing/test.d.ts

@@ -1,2 +1,4 @@
 import { Target } from '@sasjs/utils';
-export declare function runTest(target: Target, testRegExps?: string[], outDirectory?: string, flowSourcePath?: string): Promise<undefined>;
+import SASjs from '@sasjs/adapter/node';
+export declare function runTest(target: Target, testRegExps?: string[], outDirectory?: string, flowSourcePath?: string, sasjs?: SASjs): Promise<undefined>;
+export declare const getTestUrl: (target: Target, jobLocation: string) => string;

package/build/commands/testing/test.js

@@ -75,7 +75,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runTest = void 0;
+exports.getTestUrl = exports.runTest = void 0;
 var saveOutput_1 = require("./internal/saveOutput");
 var types_1 = require("../../types");
 var file_1 = require("../../utils/file");
@@ -86,11 +86,11 @@ var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var path_1 = __importDefault(require("path"));
 var chalk_1 = __importDefault(require("chalk"));
 var utils_2 = require("../../utils/utils");
-function runTest(target, testRegExps, outDirectory, flowSourcePath) {
+function runTest(target, testRegExps, outDirectory, flowSourcePath, sasjs) {
     var _a, _b;
     if (testRegExps === void 0) { testRegExps = []; }
     return __awaiter(this, void 0, void 0, function () {
-        var testFlowData, testFlow, flow, sasjs, authConfig, username, password, sas9CredentialsError, result, isCodeExamplePrinted, printCodeExample, jsonPath, xmlPath, _c, csvData, csvPath, coverageReportPath, resultTable, testsCount, passedTestsCount, testsWithResultsCount;
+        var testFlowData, testFlow, flow, authConfig, username, password, sas9CredentialsError, result, isCodeExamplePrinted, printCodeExample, jsonPath, xmlPath, _c, csvData, csvPath, coverageReportPath, resultTable, testsCount, passedTestsCount, testsWithResultsCount;
         var _this = this;
         return __generator(this, function (_d) {
             switch (_d.label) {
@@ -146,15 +146,17 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                         })), false);
                     if (testFlow.testTearDown)
                         flow.push(testFlow.testTearDown);
-                    sasjs = new node_1.default({
-                        serverUrl: target.serverUrl,
-                        httpsAgentOptions: target.httpsAgentOptions,
-                        appLoc: target.appLoc,
-                        serverType: target.serverType,
-                        debug: true,
-                        contextName: target.contextName,
-                        useComputeApi: false
-                    });
+                    sasjs =
+                        sasjs ||
+                            new node_1.default({
+                                serverUrl: target.serverUrl,
+                                httpsAgentOptions: target.httpsAgentOptions,
+                                appLoc: target.appLoc,
+                                serverType: target.serverType,
+                                debug: true,
+                                contextName: target.contextName,
+                                useComputeApi: false
+                            });
                     if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 3];
                     return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
                 case 2:
@@ -188,7 +190,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                         }
                     };
                     return [4 /*yield*/, (0, utils_1.asyncForEach)(flow, function (test) { return __awaiter(_this, void 0, void 0, function () {
-                            var sasJobLocation, testTarget, testId, testUrl, printTestUrl;
+                            var sasJobLocation, testTarget, testId, testUrl, printTestUrl, sasjsResponse, webout, testResults, existingTestTarget;
                             var _this = this;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -202,120 +204,163 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                             .pop()
                                             .replace(/(.test)?(.\d+)?(.sas)?$/i, '');
                                         testId = (0, utils_1.uuidv4)();
-                                        testUrl = "".concat(target.serverUrl, "/").concat(target.serverType === utils_1.ServerType.SasViya
-                                            ? 'SASJobExecution'
-                                            : 'SASStoredProcess', "/?_program=").concat(sasJobLocation, "&_debug=2477");
+                                        testUrl = (0, exports.getTestUrl)(target, sasJobLocation);
                                         if (target.contextName) {
                                             testUrl = "".concat(testUrl, "&_contextName=").concat(encodeURIComponent(target.contextName));
                                         }
                                         printTestUrl = function () { return process.logger.info("Test URL: ".concat(testUrl)); };
                                         printTestUrl();
-                                        return [4 /*yield*/, sasjs
-                                                .request(sasJobLocation, {}, { username: username, password: password }, function () {
-                                                (0, displayResult_1.displayError)(null, 'Login callback called. Request failed.');
-                                            }, authConfig, ['log'])
-                                                .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
-                                                var lineBreak, existingTestTarget, existingTestTarget;
-                                                var _a, _b;
-                                                return __generator(this, function (_c) {
-                                                    switch (_c.label) {
-                                                        case 0:
-                                                            lineBreak = true;
-                                                            if (!res.result) {
-                                                                (0, displayResult_1.displayError)({}, "Job did not return a response, to debug click ".concat(testUrl));
-                                                                printCodeExample();
-                                                                lineBreak = false;
-                                                                existingTestTarget = result.sasjs_test_meta.find(function (testResult) {
-                                                                    return testResult.test_target === testTarget;
-                                                                });
-                                                                if (existingTestTarget) {
-                                                                    existingTestTarget.results.push({
-                                                                        test_loc: test,
-                                                                        sasjs_test_id: testId,
-                                                                        result: types_1.TestResultStatus.notProvided,
-                                                                        test_url: testUrl
-                                                                    });
-                                                                }
-                                                                else {
-                                                                    result.sasjs_test_meta.push({
-                                                                        test_target: testTarget,
-                                                                        results: [
-                                                                            {
-                                                                                test_loc: test,
-                                                                                sasjs_test_id: testId,
-                                                                                result: types_1.TestResultStatus.notProvided,
-                                                                                test_url: testUrl
-                                                                            }
-                                                                        ]
-                                                                    });
-                                                                }
+                                        if (!(target.serverType === utils_1.ServerType.Sasjs)) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, sasjs.executeJobSASjs({
+                                                _program: sasJobLocation,
+                                                _debug: 131
+                                            })];
+                                    case 1:
+                                        sasjsResponse = _a.sent();
+                                        if (sasjsResponse._webout) {
+                                            webout = void 0;
+                                            try {
+                                                webout = JSON.parse(sasjsResponse._webout);
+                                            }
+                                            catch (error) {
+                                                return [2 /*return*/, Promise.reject("SASjs Server responded with invalid json")];
+                                            }
+                                            testResults = webout.test_results;
+                                            if (testResults) {
+                                                existingTestTarget = result.sasjs_test_meta.find(function (testResult) {
+                                                    return testResult.test_target === testTarget;
+                                                });
+                                                if (existingTestTarget) {
+                                                    existingTestTarget.results.push({
+                                                        test_loc: test,
+                                                        sasjs_test_id: testId,
+                                                        result: testResults,
+                                                        test_url: testUrl
+                                                    });
+                                                }
+                                                else {
+                                                    result.sasjs_test_meta.push({
+                                                        test_target: testTarget,
+                                                        results: [
+                                                            {
+                                                                test_loc: test,
+                                                                sasjs_test_id: testId,
+                                                                result: testResults,
+                                                                test_url: testUrl
                                                             }
-                                                            if (!((_a = res.result) === null || _a === void 0 ? void 0 : _a.test_results))
-                                                                lineBreak = false;
-                                                            if (!res.log) return [3 /*break*/, 2];
-                                                            return [4 /*yield*/, (0, saveOutput_1.saveLog)(outDirectory, test, res.log, lineBreak)];
-                                                        case 1:
-                                                            _c.sent();
-                                                            _c.label = 2;
-                                                        case 2:
-                                                            if ((_b = res.result) === null || _b === void 0 ? void 0 : _b.test_results) {
-                                                                existingTestTarget = result.sasjs_test_meta.find(function (testResult) {
-                                                                    return testResult.test_target === testTarget;
+                                                        ]
+                                                    });
+                                                }
+                                            }
+                                        }
+                                        return [3 /*break*/, 4];
+                                    case 2: return [4 /*yield*/, sasjs
+                                            .request(sasJobLocation, {}, { username: username, password: password }, function () {
+                                            (0, displayResult_1.displayError)(null, 'Login callback called. Request failed.');
+                                        }, authConfig, ['log'])
+                                            .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
+                                            var lineBreak, existingTestTarget, existingTestTarget;
+                                            var _a, _b;
+                                            return __generator(this, function (_c) {
+                                                switch (_c.label) {
+                                                    case 0:
+                                                        lineBreak = true;
+                                                        if (!res.result) {
+                                                            (0, displayResult_1.displayError)({}, "Job did not return a response, to debug click ".concat(testUrl));
+                                                            printCodeExample();
+                                                            lineBreak = false;
+                                                            existingTestTarget = result.sasjs_test_meta.find(function (testResult) {
+                                                                return testResult.test_target === testTarget;
+                                                            });
+                                                            if (existingTestTarget) {
+                                                                existingTestTarget.results.push({
+                                                                    test_loc: test,
+                                                                    sasjs_test_id: testId,
+                                                                    result: types_1.TestResultStatus.notProvided,
+                                                                    test_url: testUrl
                                                                 });
-                                                                if (existingTestTarget) {
-                                                                    existingTestTarget.results.push({
-                                                                        test_loc: test,
-                                                                        sasjs_test_id: testId,
-                                                                        result: res.result.test_results,
-                                                                        test_url: testUrl
-                                                                    });
-                                                                }
-                                                                else {
-                                                                    result.sasjs_test_meta.push({
-                                                                        test_target: testTarget,
-                                                                        results: [
-                                                                            {
-                                                                                test_loc: test,
-                                                                                sasjs_test_id: testId,
-                                                                                result: res.result.test_results,
-                                                                                test_url: testUrl
-                                                                            }
-                                                                        ]
-                                                                    });
-                                                                }
                                                             }
                                                             else {
-                                                                (0, displayResult_1.displayError)({}, "'test_results' not found in server response, to debug click ".concat(testUrl));
-                                                                printCodeExample();
+                                                                result.sasjs_test_meta.push({
+                                                                    test_target: testTarget,
+                                                                    results: [
+                                                                        {
+                                                                            test_loc: test,
+                                                                            sasjs_test_id: testId,
+                                                                            result: types_1.TestResultStatus.notProvided,
+                                                                            test_url: testUrl
+                                                                        }
+                                                                    ]
+                                                                });
                                                             }
-                                                            return [2 /*return*/];
-                                                    }
-                                                });
-                                            }); })
-                                                .catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
-                                                var _a, _b;
-                                                return __generator(this, function (_c) {
-                                                    switch (_c.label) {
-                                                        case 0:
-                                                            printTestUrl();
-                                                            if (err && err.errorCode === 404) {
-                                                                (0, utils_2.displaySasjsRunnerError)(username);
+                                                        }
+                                                        if (!((_a = res.result) === null || _a === void 0 ? void 0 : _a.test_results))
+                                                            lineBreak = false;
+                                                        if (!res.log) return [3 /*break*/, 2];
+                                                        return [4 /*yield*/, (0, saveOutput_1.saveLog)(outDirectory, test, res.log, lineBreak)];
+                                                    case 1:
+                                                        _c.sent();
+                                                        _c.label = 2;
+                                                    case 2:
+                                                        if ((_b = res.result) === null || _b === void 0 ? void 0 : _b.test_results) {
+                                                            existingTestTarget = result.sasjs_test_meta.find(function (testResult) {
+                                                                return testResult.test_target === testTarget;
+                                                            });
+                                                            if (existingTestTarget) {
+                                                                existingTestTarget.results.push({
+                                                                    test_loc: test,
+                                                                    sasjs_test_id: testId,
+                                                                    result: res.result.test_results,
+                                                                    test_url: testUrl
+                                                                });
                                                             }
                                                             else {
-                                                                (0, displayResult_1.displayError)({}, "An error occurred while executing the request. Job location: ".concat(sasJobLocation));
+                                                                result.sasjs_test_meta.push({
+                                                                    test_target: testTarget,
+                                                                    results: [
+                                                                        {
+                                                                            test_loc: test,
+                                                                            sasjs_test_id: testId,
+                                                                            result: res.result.test_results,
+                                                                            test_url: testUrl
+                                                                        }
+                                                                    ]
+                                                                });
                                                             }
-                                                            if (!((_b = (_a = err === null || err === void 0 ? void 0 : err.error) === null || _a === void 0 ? void 0 : _a.details) === null || _b === void 0 ? void 0 : _b.result)) return [3 /*break*/, 2];
-                                                            return [4 /*yield*/, (0, saveOutput_1.saveLog)(outDirectory, test, err.error.details.result)];
-                                                        case 1:
-                                                            _c.sent();
-                                                            _c.label = 2;
-                                                        case 2: return [2 /*return*/];
-                                                    }
-                                                });
-                                            }); })];
-                                    case 1:
+                                                        }
+                                                        else {
+                                                            (0, displayResult_1.displayError)({}, "'test_results' not found in server response, to debug click ".concat(testUrl));
+                                                            printCodeExample();
+                                                        }
+                                                        return [2 /*return*/];
+                                                }
+                                            });
+                                        }); })
+                                            .catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
+                                            var _a, _b;
+                                            return __generator(this, function (_c) {
+                                                switch (_c.label) {
+                                                    case 0:
+                                                        printTestUrl();
+                                                        if (err && err.errorCode === 404) {
+                                                            (0, utils_2.displaySasjsRunnerError)(username);
+                                                        }
+                                                        else {
+                                                            (0, displayResult_1.displayError)({}, "An error occurred while executing the request. Job location: ".concat(sasJobLocation));
+                                                        }
+                                                        if (!((_b = (_a = err === null || err === void 0 ? void 0 : err.error) === null || _a === void 0 ? void 0 : _a.details) === null || _b === void 0 ? void 0 : _b.result)) return [3 /*break*/, 2];
+                                                        return [4 /*yield*/, (0, saveOutput_1.saveLog)(outDirectory, test, err.error.details.result)];
+                                                    case 1:
+                                                        _c.sent();
+                                                        _c.label = 2;
+                                                    case 2: return [2 /*return*/];
+                                                }
+                                            });
+                                        }); })];
+                                    case 3:
                                         _a.sent();
-                                        return [2 /*return*/];
+                                        _a.label = 4;
+                                    case 4: return [2 /*return*/];
                                 }
                             });
                         }); })];
@@ -367,3 +412,11 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
     });
 }
 exports.runTest = runTest;
+var getTestUrl = function (target, jobLocation) {
+    return "".concat(target.serverUrl, "/").concat(target.serverType === utils_1.ServerType.SasViya
+        ? 'SASJobExecution'
+        : target.serverType === utils_1.ServerType.Sas9
+            ? 'SASStoredProcess'
+            : 'SASjsApi/stp/execute', "/?_program=").concat(jobLocation, "&_debug=2477");
+};
+exports.getTestUrl = getTestUrl;

package/build/commands/web/internal/getTags.d.ts

@@ -1,5 +1,7 @@
 import { JSDOM } from 'jsdom';
 export declare const getScriptTags: (parsedHtml: JSDOM) => HTMLScriptElement[];
+export declare const getStyleInPageTags: (parsedHtml: JSDOM) => HTMLStyleElement[];
 export declare const getStyleTags: (parsedHtml: JSDOM) => HTMLLinkElement[];
 export declare const getFaviconTags: (parsedHtml: JSDOM) => HTMLLinkElement[];
 export declare const getImgTags: (parsedHtml: JSDOM) => HTMLImageElement[];
+export declare const getSourceTags: (parsedHtml: JSDOM) => HTMLSourceElement[];

package/build/commands/web/internal/getTags.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getScriptTags = void 0;
+exports.getSourceTags = exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getStyleInPageTags = exports.getScriptTags = void 0;
 var getScriptTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('script'));
 };
 exports.getScriptTags = getScriptTags;
+var getStyleInPageTags = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.getElementsByTagName('style'));
+};
+exports.getStyleInPageTags = getStyleInPageTags;
 var getStyleTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('link')).filter(function (s) { return s.getAttribute('rel') === 'stylesheet'; });
 };
@@ -17,3 +21,7 @@ var getImgTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('img')).filter(function (s) { return s.getAttribute('src'); });
 };
 exports.getImgTags = getImgTags;
+var getSourceTags = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.getElementsByTagName('source')).filter(function (s) { return s.getAttribute('src'); });
+};
+exports.getSourceTags = getSourceTags;

package/build/commands/web/internal/spec/testFiles/script3.d.ts

@@ -0,0 +1,23 @@
+declare function init(): void;
+declare function main(): void;
+declare function update(dt: any): void;
+declare function handleInput(dt: any): void;
+declare function updateEntities(dt: any, gameTime: any): void;
+declare function checkCollisions(): void;
+declare function render(): void;
+declare function renderEntity(entity: any): void;
+declare var requestAnimFrame: ((callback: FrameRequestCallback) => number) & typeof requestAnimationFrame;
+declare var canvas: HTMLCanvasElement;
+declare var ctx: CanvasRenderingContext2D | null;
+declare var updateables: any[];
+declare var fireballs: any[];
+declare var player: any;
+declare var vX: number;
+declare var vY: number;
+declare var vWidth: number;
+declare var vHeight: number;
+declare var level: any;
+declare var sounds: any;
+declare var music: any;
+declare var lastTime: any;
+declare var gameTime: number;

package/build/commands/web/internal/spec/testFiles/script3.js

@@ -0,0 +1,218 @@
+"use strict";
+// game.js from SASjs/Mario
+// https://github.com/sasjs/mario/blob/main/src/js/game.js
+var requestAnimFrame = (function () {
+    return (window.requestAnimationFrame ||
+        window.webkitRequestAnimationFrame ||
+        window.mozRequestAnimationFrame ||
+        window.oRequestAnimationFrame ||
+        window.msRequestAnimationFrame ||
+        function (callback) {
+            window.setTimeout(callback, 1000 / 60);
+        });
+})();
+//create the canvas
+var canvas = document.createElement('canvas');
+var ctx = canvas.getContext('2d');
+var updateables = [];
+var fireballs = [];
+var player = new Mario.Player([0, 0]);
+//we might have to get the size and calculate the scaling
+//but this method should let us make it however big.
+//Cool!
+//TODO: Automatically scale the game to work and look good on widescreen.
+//TODO: fiddling with scaled sprites looks BETTER, but not perfect. Hmm.
+canvas.width = 762;
+canvas.height = 720;
+ctx.scale(3, 3);
+document.body.appendChild(canvas);
+//viewport
+var vX = 0, vY = 0, vWidth = 256, vHeight = 240;
+//load our images
+resources.load([
+    'sprites/player.png',
+    'sprites/enemy.png',
+    'sprites/tiles.png',
+    'sprites/playerl.png',
+    'sprites/items.png',
+    'sprites/enemyr.png'
+]);
+resources.onReady(init);
+var level;
+var sounds;
+var music;
+//initialize
+var lastTime;
+function init() {
+    music = {
+        overworld: new Audio('sounds/aboveground_bgm.ogg'),
+        underground: new Audio('sounds/underground_bgm.ogg'),
+        clear: new Audio('sounds/stage_clear.wav'),
+        death: new Audio('sounds/mariodie.wav')
+    };
+    sounds = {
+        smallJump: new Audio('sounds/jump-small.wav'),
+        bigJump: new Audio('sounds/jump-super.wav'),
+        breakBlock: new Audio('sounds/breakblock.wav'),
+        bump: new Audio('sounds/bump.wav'),
+        coin: new Audio('sounds/coin.wav'),
+        fireball: new Audio('sounds/fireball.wav'),
+        flagpole: new Audio('sounds/flagpole.wav'),
+        kick: new Audio('sounds/kick.wav'),
+        pipe: new Audio('sounds/pipe.wav'),
+        itemAppear: new Audio('sounds/itemAppear.wav'),
+        powerup: new Audio('sounds/powerup.wav'),
+        stomp: new Audio('sounds/stomp.wav')
+    };
+    Mario.oneone();
+    lastTime = Date.now();
+    main();
+}
+var gameTime = 0;
+//set up the game loop
+function main() {
+    var now = Date.now();
+    var dt = (now - lastTime) / 1000.0;
+    update(dt);
+    render();
+    lastTime = now;
+    requestAnimFrame(main);
+}
+function update(dt) {
+    gameTime += dt;
+    handleInput(dt);
+    updateEntities(dt, gameTime);
+    checkCollisions();
+}
+function handleInput(dt) {
+    if (player.piping || player.dying || player.noInput)
+        return; //don't accept input
+    if (input.isDown('RUN')) {
+        player.run();
+    }
+    else {
+        player.noRun();
+    }
+    if (input.isDown('JUMP')) {
+        player.jump();
+    }
+    else {
+        //we need this to handle the timing for how long you hold it
+        player.noJump();
+    }
+    if (input.isDown('DOWN')) {
+        player.crouch();
+    }
+    else {
+        player.noCrouch();
+    }
+    if (input.isDown('LEFT')) {
+        // 'd' or left arrow
+        player.moveLeft();
+    }
+    else if (input.isDown('RIGHT')) {
+        // 'k' or right arrow
+        player.moveRight();
+    }
+    else {
+        player.noWalk();
+    }
+}
+//update all the moving stuff
+function updateEntities(dt, gameTime) {
+    player.update(dt, vX);
+    updateables.forEach(function (ent) {
+        ent.update(dt, gameTime);
+    });
+    //This should stop the jump when he switches sides on the flag.
+    if (player.exiting) {
+        if (player.pos[0] > vX + 96)
+            vX = player.pos[0] - 96;
+    }
+    else if (level.scrolling && player.pos[0] > vX + 80) {
+        vX = player.pos[0] - 80;
+    }
+    if (player.powering.length !== 0 || player.dying) {
+        return;
+    }
+    level.items.forEach(function (ent) {
+        ent.update(dt);
+    });
+    level.enemies.forEach(function (ent) {
+        ent.update(dt, vX);
+    });
+    fireballs.forEach(function (fireball) {
+        fireball.update(dt);
+    });
+    level.pipes.forEach(function (pipe) {
+        pipe.update(dt);
+    });
+}
+//scan for collisions
+function checkCollisions() {
+    if (player.powering.length !== 0 || player.dying) {
+        return;
+    }
+    player.checkCollisions();
+    //Apparently for each will just skip indices where things were deleted.
+    level.items.forEach(function (item) {
+        item.checkCollisions();
+    });
+    level.enemies.forEach(function (ent) {
+        ent.checkCollisions();
+    });
+    fireballs.forEach(function (fireball) {
+        fireball.checkCollisions();
+    });
+    level.pipes.forEach(function (pipe) {
+        pipe.checkCollisions();
+    });
+}
+//draw the game!
+function render() {
+    updateables = [];
+    ctx.clearRect(0, 0, canvas.width, canvas.height);
+    ctx.fillStyle = level.background;
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+    //scenery gets drawn first to get layering right.
+    for (var i = 0; i < 15; i++) {
+        for (var j = Math.floor(vX / 16) - 1; j < Math.floor(vX / 16) + 20; j++) {
+            if (level.scenery[i][j]) {
+                renderEntity(level.scenery[i][j]);
+            }
+        }
+    }
+    //then items
+    level.items.forEach(function (item) {
+        renderEntity(item);
+    });
+    level.enemies.forEach(function (enemy) {
+        renderEntity(enemy);
+    });
+    fireballs.forEach(function (fireball) {
+        renderEntity(fireball);
+    });
+    //then we draw every static object.
+    for (var i = 0; i < 15; i++) {
+        for (var j = Math.floor(vX / 16) - 1; j < Math.floor(vX / 16) + 20; j++) {
+            if (level.statics[i][j]) {
+                renderEntity(level.statics[i][j]);
+            }
+            if (level.blocks[i][j]) {
+                renderEntity(level.blocks[i][j]);
+                updateables.push(level.blocks[i][j]);
+            }
+        }
+    }
+    //then the player
+    if (player.invincibility % 2 === 0) {
+        renderEntity(player);
+    }
+    //Mario goes INTO pipes, so naturally they go after.
+    level.pipes.forEach(function (pipe) {
+        renderEntity(pipe);
+    });
+}
+function renderEntity(entity) {
+    entity.render(ctx, vX, vY);
+}

package/build/commands/web/internal/spec/updateLinkTag.spec.js

@@ -26,7 +26,7 @@ describe('updateLinkTag', function () {
             source: 'image.jpeg',
             target: sasProgramPath
         });
-        (0, updateLinkTag_1.updateLinkTag)(imgTag, assetPathMap, 'image');
+        (0, updateLinkTag_1.updateLinkTag)(imgTag, assetPathMap, 'src');
         expect(imgTag.getAttribute('src')).toEqual(sasProgramPath);
     });
 });