chore(release): 0.0.39

Executable macros fix

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.39](https://github.com/sasjs/server/compare/v0.0.38...v0.0.39) (2022-03-23)
+
+
+### Bug Fixes
+
+* included sasjs core macros at compile time ([e680901](https://github.com/sasjs/server/commit/e68090181acd844f86f3e81153cb5a4e3f4a307f))
+
+### [0.0.38](https://github.com/sasjs/server/compare/v0.0.37...v0.0.38) (2022-03-23)
+
+
+### Bug Fixes
+
+* quick fix for executables ([9e53470](https://github.com/sasjs/server/commit/9e53470947350f4b8d835a2cb6b70e3dabf247c4))
+
 ### [0.0.37](https://github.com/sasjs/server/compare/v0.0.36...v0.0.37) (2022-03-23)
 
 

api/package.json

@@ -29,6 +29,7 @@
     "assets": [
       "./build/public/**/*",
       "./build/sasjsbuild/**/*",
+      "./build/sasjscore/**/*",
       "./web/build/**/*"
     ],
     "targets": [

api/src/app.ts

@@ -7,7 +7,6 @@ import cors from 'cors'
 
 import {
   connectDB,
-  copySASjsCore,
   getWebBuildFolderPath,
   loadAppStreamConfig,
   sasJSCoreMacros,
@@ -43,8 +42,6 @@ const onError: ErrorRequestHandler = (err, req, res, next) => {
 }
 
 export default setProcessVariables().then(async () => {
-  await copySASjsCore()
-
   // loading these modules after setting up variables due to
   // multer's usage of process var process.driveLoc
   const { setupRoutes } = await import('./routes/setupRoutes')

api/src/controllers/internal/Execution.ts

@@ -13,9 +13,9 @@ import {
   extractHeaders,
   generateFileUploadSasCode,
   getTmpFilesFolderPath,
-  getTmpMacrosPath,
   HTTPHeaders,
-  isDebugOn
+  isDebugOn,
+  sasJSCoreMacros
 } from '../../utils'
 
 export interface ExecutionVars {
@@ -106,7 +106,7 @@ export class ExecutionController {
 `
 
     program = `
-options insert=(SASAUTOS="${getTmpMacrosPath()}");
+options insert=(SASAUTOS="${sasJSCoreMacros}");
 
 /* runtime vars */
 ${varStatments}

api/src/utils/copySASjsCore.ts

@@ -1,10 +0,0 @@
-import { copy, createFolder } from '@sasjs/utils'
-
-import { getTmpMacrosPath, sasJSCoreMacros } from '.'
-
-export const copySASjsCore = async () => {
-  await createFolder(sasJSCoreMacros)
-
-  const macrosDrivePath = getTmpMacrosPath()
-  await copy(sasJSCoreMacros, macrosDrivePath)
-}

api/src/utils/file.ts

@@ -18,8 +18,6 @@ export const getTmpFolderPath = () => process.driveLoc
 export const getTmpAppStreamConfigPath = () =>
   path.join(getTmpFolderPath(), 'appStreamConfig.json')
 
-export const getTmpMacrosPath = () => path.join(getTmpFolderPath(), 'sasjscore')
-
 export const getTmpUploadsPath = () => path.join(getTmpFolderPath(), 'uploads')
 
 export const getTmpFilesFolderPath = () =>

api/src/utils/index.ts

@@ -1,14 +1,13 @@
 export * from './appStreamConfig'
 export * from './connectDB'
-export * from './copySASjsCore'
 export * from './extractHeaders'
 export * from './file'
 export * from './generateAccessToken'
 export * from './generateAuthCode'
 export * from './generateRefreshToken'
+export * from './isDebugOn'
 export * from './getCertificates'
 export * from './getDesktopFields'
-export * from './isDebugOn'
 export * from './parseLogToArray'
 export * from './removeTokensInDB'
 export * from './saveTokensInDB'

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "server",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "server",
-      "version": "0.0.37",
+      "version": "0.0.39",
       "devDependencies": {
         "prettier": "^2.3.1",
         "standard-version": "^9.3.2"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "description": "NodeJS wrapper for calling the SAS binary executable",
   "repository": "https://github.com/sasjs/server",
   "scripts": {