bare-ui-kit 0.1.0 → 0.2.0

package/CMakeLists.txt

@@ -5,9 +5,23 @@ find_package(cmake-fetch REQUIRED PATHS node_modules/cmake-fetch)
 
 project(bare_ui_kit C OBJC)
 
-fetch_package("github:holepunchto/bare@1.24.5")
+fetch_package("github:holepunchto/bare@1.25.0")
 fetch_package("github:holepunchto/libpath")
 
+add_bare_module(bare_ui_kit)
+
+target_sources(
+  ${bare_ui_kit}
+  PRIVATE
+    binding.m
+)
+
+target_link_libraries(
+  ${bare_ui_kit}
+  PUBLIC
+    "-framework UIKit"
+)
+
 add_executable(bare_runtime)
 
 target_sources(
@@ -35,7 +49,6 @@ target_link_libraries(
   PUBLIC
     $<LINK_LIBRARY:WHOLE_ARCHIVE,bare_static>
   PRIVATE
-    log_static
     rlimit_static
     path_static
 )

package/README.md

@@ -1,6 +1,6 @@
 # bare-ui-kit
 
-UIKit runtime for Bare.
+UIKit bindings and runtime for Bare.
 
 ```
 npm i bare-ui-kit

package/binding.js

@@ -0,0 +1 @@
+module.exports = require.addon()

package/binding.m

@@ -0,0 +1,39 @@
+#import <assert.h>
+#import <bare.h>
+#import <js.h>
+#import <utf.h>
+
+#import <UIKit/UIKit.h>
+
+#import "lib/view.h"
+#import "lib/view-controller.h"
+#import "lib/window.h"
+
+static js_value_t *
+bare_ui_kit_exports(js_env_t *env, js_value_t *exports) {
+  int err;
+
+#define V(name, fn) \
+  { \
+    js_value_t *val; \
+    err = js_create_function(env, name, -1, fn, NULL, &val); \
+    assert(err == 0); \
+    err = js_set_named_property(env, exports, name, val); \
+    assert(err == 0); \
+  }
+
+  V("viewHidden", bare_ui_kit_view_hidden)
+  V("viewAddSubview", bare_ui_kit_view_add_subview)
+
+  V("viewControllerInit", bare_ui_kit_view_controller_init)
+  V("viewControllerView", bare_ui_kit_view_controller_view)
+
+  V("windowInit", bare_ui_kit_window_init)
+  V("windowRootViewController", bare_ui_kit_window_root_view_controller)
+  V("windowMakeKeyWindow", bare_ui_kit_window_make_key_window)
+#undef V
+
+  return exports;
+}
+
+BARE_MODULE(bare_ui_kit, bare_ui_kit_exports)

package/index.js

@@ -0,0 +1,3 @@
+exports.View = require('./lib/view')
+exports.ViewController = require('./lib/view-controller')
+exports.Window = require('./lib/window')

package/lib/bridging.h

@@ -0,0 +1,8 @@
+#import <js.h>
+
+#import <Foundation/Foundation.h>
+
+static void
+bare_ui_kit__on_bridged_release(js_env_t *env, void *data, void *finalize_hint) {
+  CFBridgingRelease(data);
+}

package/lib/runtime.m

@@ -1,7 +1,6 @@
 #import <assert.h>
 #import <bare.h>
 #import <js.h>
-#import <log.h>
 #import <path.h>
 #import <rlimit.h>
 #import <signal.h>
@@ -141,6 +140,23 @@ bare__terminate(void) {
 
   err = bare_terminate(bare);
   assert(err == 0);
+
+  err = bare_run(bare, UV_RUN_DEFAULT);
+  assert(err == 0);
+
+  int exit_code;
+  err = bare_teardown(bare, UV_RUN_DEFAULT, &exit_code);
+  assert(err == 0);
+
+  err = uv_loop_close(bare__loop);
+  assert(err == 0);
+
+  err = uv_async_send(&bare__platform_shutdown);
+  assert(err == 0);
+
+  uv_thread_join(&bare__platform_thread);
+
+  if (exit_code != 0) _exit(exit_code);
 }
 
 static void
@@ -191,12 +207,11 @@ main(int argc, char *argv[]) {
   signal(SIGPIPE, SIG_IGN);
 #endif
 
-  err = log_open("bare", 0);
-  assert(err == 0);
-
   err = rlimit_set(rlimit_open_files, rlimit_infer);
   assert(err == 0);
 
+  uv_disable_stdio_inheritance();
+
   argv = uv_setup_args(argc, argv);
 
   err = uv_barrier_init(&bare__platform_ready, 2);

package/lib/view-controller.h

@@ -0,0 +1,97 @@
+#import <assert.h>
+#import <bare.h>
+#import <js.h>
+
+#import <UIKit/UIKit.h>
+
+#import "bridging.h"
+
+@interface BareViewController : UIViewController {
+@public
+  js_env_t *env;
+  js_ref_t *ctx;
+}
+
+@end
+
+@implementation BareViewController
+
+- (void)dealloc {
+  int err;
+
+  err = js_delete_reference(env, ctx);
+  assert(err == 0);
+
+  [super dealloc];
+}
+
+@end
+
+static js_value_t *
+bare_ui_kit_view_controller_init(js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 1;
+  js_value_t *argv[1];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 1);
+
+  js_value_t *result;
+
+  @autoreleasepool {
+    BareViewController *handle = [[BareViewController alloc] init];
+
+    err = js_create_external(env, (void *) CFBridgingRetain(handle), bare_ui_kit__on_bridged_release, NULL, &result);
+    assert(err == 0);
+
+    handle->env = env;
+
+    err = js_create_reference(env, argv[0], 1, &handle->ctx);
+    assert(err == 0);
+  }
+
+  return result;
+}
+
+static js_value_t *
+bare_ui_kit_view_controller_view(js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 2;
+  js_value_t *argv[2];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 1 || argc == 2);
+
+  void *handle;
+  err = js_get_value_external(env, argv[0], &handle);
+  assert(err == 0);
+
+  js_value_t *result = NULL;
+
+  @autoreleasepool {
+    UIViewController *view_controller = (__bridge UIViewController *) handle;
+
+    if (argc == 1) {
+      UIView *view = view_controller.view;
+
+      err = js_create_external(env, (void *) CFBridgingRetain(view), bare_ui_kit__on_bridged_release, NULL, &result);
+      assert(err == 0);
+    } else {
+      void *handle;
+      err = js_get_value_external(env, argv[1], &handle);
+      assert(err == 0);
+
+      UIView *view = (__bridge UIView *) handle;
+
+      view_controller.view = view;
+    }
+  }
+
+  return result;
+}

package/lib/view-controller.js

@@ -0,0 +1,25 @@
+const EventEmitter = require('bare-events')
+const binding = require('../binding')
+const UIKitView = require('./view')
+
+module.exports = class UIKitViewController extends EventEmitter {
+  constructor(handle = null) {
+    super()
+
+    this._handle = handle || binding.viewControllerInit(this)
+  }
+
+  get view() {
+    return new UIKitView(binding.viewControllerView(this._handle))
+  }
+
+  set view(view) {
+    binding.viewControllerView(this._handle, view._handle)
+  }
+
+  [Symbol.for('bare.inspect')]() {
+    return {
+      __proto__: { constructor: UIKitViewController }
+    }
+  }
+}

package/lib/view.h

@@ -0,0 +1,73 @@
+
+#import <assert.h>
+#import <bare.h>
+#import <js.h>
+
+#import <UIKit/UIKit.h>
+
+static js_value_t *
+bare_ui_kit_view_hidden(js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 2;
+  js_value_t *argv[2];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 1 || argc == 2);
+
+  void *handle;
+  err = js_get_value_external(env, argv[0], &handle);
+  assert(err == 0);
+
+  js_value_t *result = NULL;
+
+  @autoreleasepool {
+    UIView *view = (__bridge UIView *) handle;
+
+    if (argc == 1) {
+      err = js_get_boolean(env, view.hidden, &result);
+      assert(err == 0);
+    } else {
+      bool value;
+      err = js_get_value_bool(env, argv[1], &value);
+      assert(err == 0);
+
+      view.hidden = value;
+    }
+  }
+
+  return result;
+}
+
+static js_value_t *
+bare_ui_kit_view_add_subview(js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 2;
+  js_value_t *argv[2];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 2);
+
+  void *handle;
+  err = js_get_value_external(env, argv[0], &handle);
+  assert(err == 0);
+
+  @autoreleasepool {
+    UIView *view = (__bridge UIView *) handle;
+
+    void *handle;
+    err = js_get_value_external(env, argv[1], &handle);
+    assert(err == 0);
+
+    UIView *subview = (__bridge UIView *) handle;
+
+    [view addSubview:subview];
+  }
+
+  return NULL;
+}

package/lib/view.js

@@ -0,0 +1,29 @@
+const EventEmitter = require('bare-events')
+const binding = require('../binding')
+
+module.exports = class UIKitView extends EventEmitter {
+  constructor(handle = null) {
+    super()
+
+    this._handle = handle
+  }
+
+  get hidden() {
+    return binding.viewHidden(this._handle)
+  }
+
+  set hidden(value) {
+    binding.viewHidden(this._handle, value)
+  }
+
+  addSubview(view) {
+    binding.viewAddSubview(this._handle, view._handle)
+    return this
+  }
+
+  [Symbol.for('bare.inspect')]() {
+    return {
+      __proto__: { constructor: UIKitView }
+    }
+  }
+}

package/lib/window.h

@@ -0,0 +1,124 @@
+#import <assert.h>
+#import <bare.h>
+#import <js.h>
+
+#import <UIKit/UIKit.h>
+
+#import "bridging.h"
+
+@interface BareWindow : UIWindow {
+@public
+  js_env_t *env;
+  js_ref_t *ctx;
+}
+
+@end
+
+@implementation BareWindow
+
+- (void)dealloc {
+  int err;
+
+  err = js_delete_reference(env, ctx);
+  assert(err == 0);
+
+  [super dealloc];
+}
+
+@end
+
+static js_value_t *
+bare_ui_kit_window_init(js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 1;
+  js_value_t *argv[1];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 1);
+
+  js_value_t *result;
+
+  @autoreleasepool {
+    BareWindow *handle = [[BareWindow alloc] init];
+
+    err = js_create_external(env, (void *) CFBridgingRetain(handle), bare_ui_kit__on_bridged_release, NULL, &result);
+    assert(err == 0);
+
+    handle->env = env;
+
+    err = js_create_reference(env, argv[0], 1, &handle->ctx);
+    assert(err == 0);
+  }
+
+  return result;
+}
+
+static js_value_t *
+bare_ui_kit_window_root_view_controller(js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 2;
+  js_value_t *argv[2];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 1 || argc == 2);
+
+  void *handle;
+  err = js_get_value_external(env, argv[0], &handle);
+  assert(err == 0);
+
+  js_value_t *result = NULL;
+
+  @autoreleasepool {
+    UIWindow *window = (__bridge UIWindow *) handle;
+
+    if (argc == 1) {
+      UIViewController *view_controller = window.rootViewController;
+
+      if (view_controller == NULL) return NULL;
+
+      err = js_create_external(env, (void *) CFBridgingRetain(handle), bare_ui_kit__on_bridged_release, NULL, &result);
+      assert(err == 0);
+    } else {
+      void *handle;
+      err = js_get_value_external(env, argv[1], &handle);
+      assert(err == 0);
+
+      UIViewController *view_controller = (__bridge UIViewController *) handle;
+
+      window.rootViewController = view_controller;
+    }
+  }
+
+  return result;
+}
+
+static js_value_t *
+bare_ui_kit_window_make_key_window(js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 1;
+  js_value_t *argv[1];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 1);
+
+  void *handle;
+  err = js_get_value_external(env, argv[0], &handle);
+  assert(err == 0);
+
+  @autoreleasepool {
+    BareWindow *window = (__bridge BareWindow *) handle;
+
+    [window makeKeyWindow];
+  }
+
+  return NULL;
+}

package/lib/window.js

@@ -0,0 +1,34 @@
+const binding = require('../binding')
+const UIKitView = require('./view')
+const UIKitViewController = require('./view-controller')
+
+module.exports = exports = class UIKitWindow extends UIKitView {
+  constructor() {
+    super()
+
+    this._handle = binding.windowInit(this)
+  }
+
+  get rootViewController() {
+    const handle = binding.windowRootViewController(this._handle)
+
+    if (handle === undefined) return null
+
+    return new UIKitViewController(handle)
+  }
+
+  set rootViewController(viewController) {
+    binding.windowRootViewController(this._handle, viewController._handle)
+  }
+
+  makeKeyWindow() {
+    binding.windowMakeKeyWindow(this._handle)
+    return this
+  }
+
+  [Symbol.for('bare.inspect')]() {
+    return {
+      __proto__: { constructor: UIKitWindow }
+    }
+  }
+}

package/package.json

@@ -1,20 +1,26 @@
 {
   "name": "bare-ui-kit",
-  "version": "0.1.0",
-  "description": "UIKit runtime for Bare",
+  "version": "0.2.0",
+  "description": "UIKit bindings and runtime for Bare",
   "exports": {
     "./package": "./package.json",
+    ".": "./index.js",
     "./runtime": "./runtime.js"
   },
   "files": [
     "index.js",
+    "binding.m",
+    "binding.js",
     "runtime.js",
     "CMakeLists.txt",
     "lib",
     "prebuilds"
   ],
+  "addon": true,
   "scripts": {
-    "test": "prettier . --check"
+    "format": "prettier --write . && lunte --fix",
+    "lint": "prettier --check . && lunte",
+    "test": "brittle-bare --coverage test.js"
   },
   "repository": {
     "type": "git",
@@ -27,12 +33,17 @@
   },
   "homepage": "https://github.com/holepunchto/bare-ui-kit#readme",
   "dependencies": {
+    "bare-events": "^2.8.2",
     "require-asset": "^1.1.0"
   },
+  "peerDependencies": {
+    "bare-build": "^1.0.0"
+  },
   "devDependencies": {
     "brittle": "^3.18.0",
     "cmake-bare": "^1.6.5",
     "cmake-fetch": "^1.4.0",
+    "lunte": "^1.8.0",
     "prettier": "^3.4.1",
     "prettier-config-holepunch": "^2.0.0"
   }

package/runtime.js

@@ -1,3 +1,7 @@
+const { type } = require('bare-build/constants')
+
+const { EXECUTABLE } = type
+
 require.asset = require('require-asset')
 
 const prebuilds = {}
@@ -5,13 +9,25 @@ const prebuilds = {}
 exports.prebuilds = prebuilds
 
 prebuilds['ios-arm64'] = () => {
-  return require.asset('./prebuilds/ios-arm64/bare', __filename)
+  return {
+    type: EXECUTABLE,
+    path: require.asset('./prebuilds/ios-arm64/bare', __filename),
+    dependencies: []
+  }
 }
 
 prebuilds['ios-arm64-simulator'] = () => {
-  return require.asset('./prebuilds/ios-arm64-simulator/bare', __filename)
+  return {
+    type: EXECUTABLE,
+    path: require.asset('./prebuilds/ios-arm64-simulator/bare', __filename),
+    dependencies: []
+  }
 }
 
 prebuilds['ios-x64-simulator'] = () => {
-  return require.asset('./prebuilds/ios-x64-simulator/bare', __filename)
+  return {
+    type: EXECUTABLE,
+    path: require.asset('./prebuilds/ios-x64-simulator/bare', __filename),
+    dependencies: []
+  }
 }